Commit Graph

1609 Commits

Author SHA1 Message Date
yanglin
847f29b5c2 REQ-3045: 添加必要的日志 2024-10-28 10:38:44 +08:00
yanglin
5ea509c0ae REQ-3045: 刷oms/cms都刷成新页面 2024-10-28 09:50:42 +08:00
yanglin
55d3393ea0 REQ-3045: 协助原生跳待办新页面 2024-10-25 17:53:33 +08:00
yanglin
11e10f0980 REQ-3045: 协助原生跳待办新页面 2024-10-25 17:53:17 +08:00
yanglin
0564577bdf REQ-3045: 协助原生跳待办新页面 2024-10-25 17:51:33 +08:00
yanglin
e09f64e7e6 REQ-3045: 协助原生跳待办新页面 2024-10-25 17:51:13 +08:00
yanglin
972ef8b16c REQ-3045: 协助原生跳待办新页面 2024-10-25 17:50:33 +08:00
yangqicheng
0f42306485 REQ-2595-添加待办分页查询接口 2024-10-25 17:50:19 +08:00
yanglin
c7b5a4712a REQ-3045: 协助原生跳待办新页面 2024-10-25 17:49:20 +08:00
yanglin
83367517f0 REQ-3045: 协助原生跳待办新页面 2024-10-25 17:47:21 +08:00
yanglin
3cd02f85fc REQ-3045: format code 2024-10-25 17:26:19 +08:00
yanglin
c3ec495d48 REQ-3045: format code 2024-10-25 16:48:10 +08:00
yangqicheng
1f7d89bd2e REQ-2595-增加根据IdentityCode列表批量完成待办接口 2024-10-25 15:11:32 +08:00
yangqicheng
8be1bf1be4 REQ-2595-调整业务待办转交逻辑 2024-10-25 14:06:24 +08:00
yanglin
ab0c07280b REQ-3045: 处理url没值的情况 2024-10-25 11:11:04 +08:00
yanglin
62c1fc3644 REQ-3045: 处理url没值的情况 2024-10-25 11:04:06 +08:00
yanglin
dfc0733403 REQ-3045: 处理url没值的情况 2024-10-25 10:54:09 +08:00
yanglin
881e44974d REQ-3045: 处理url没值的情况 2024-10-25 10:41:25 +08:00
yanglin
d241accae8 REQ-3045: 处理url没值的情况 2024-10-25 10:27:28 +08:00
yanglin
533ede6d07 REQ-3045: 协助原生跳待办新页面 2024-10-25 09:58:00 +08:00
yanglin
22291bc287 REQ-3045: 协助原生跳待办新页面 2024-10-24 18:46:22 +08:00
yanglin
2073456391 Revert "Revert "REQ-3045: 协助原生跳待办新页面""
This reverts commit ce768b019a.
2024-10-24 18:46:13 +08:00
yanglin
ce768b019a Revert "REQ-3045: 协助原生跳待办新页面"
This reverts commit 3113997f92.
2024-10-24 18:45:26 +08:00
yanglin
3113997f92 REQ-3045: 协助原生跳待办新页面 2024-10-24 18:39:27 +08:00
yanglin
60ca2fe6ad REQ-3045: 协助原生跳待办新页面 2024-10-24 18:24:05 +08:00
yanglin
7cbb50e4f3 REQ-3045: 协助原生跳待办新页面 2024-10-24 18:23:01 +08:00
yanglin
18e955c6b9 REQ-3045: 协助原生跳待办新页面 2024-10-24 18:18:47 +08:00
yanglin
4c17ca0d36 REQ-3045: 协助原生跳待办新页面 2024-10-24 18:12:16 +08:00
yanglin
0ee2881214 REQ-3045: fix NPE 2024-10-24 16:31:08 +08:00
yanglin
fbd5a92fb0 REQ-3045: 处理迁移数据问题 2024-10-24 16:08:48 +08:00
yanglin
fb530c27b8 REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 14:02:56 +08:00
yanglin
76f1fa6665 REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 13:50:24 +08:00
yanglin
2fc20c746b REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 13:48:20 +08:00
yanglin
95598179f5 REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 13:46:47 +08:00
yanglin
803d96bfc4 REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 11:49:47 +08:00
yanglin
ac63ee6025 REQ-3045: 减少响应大小 2024-10-24 10:56:56 +08:00
yanglin
8ca03e22c0 REQ-3045: 减少响应大小 2024-10-24 10:56:15 +08:00
yanglin
787210f72d REQ-3045: 减少响应大小 2024-10-24 10:55:47 +08:00
yanglin
3c27197a94 REQ-3045: 减少响应大小 2024-10-24 10:54:48 +08:00
yanglin
f2e21ee55d REQ-3045: 减少响应大小 2024-10-24 10:46:41 +08:00
yanglin
29c1507b8a REQ-3045: 减少响应大小 2024-10-24 10:45:53 +08:00
yanglin
e9628f8827 REQ-3045: 减少响应大小 2024-10-24 10:44:51 +08:00
yanglin
b465538289 REQ-3045: 减少响应大小 2024-10-24 10:44:22 +08:00
yanglin
de834eda35 REQ-3045: 减少响应大小 2024-10-24 10:01:17 +08:00
yanglin
875786c94e REQ-3045: 减少响应大小 2024-10-23 20:45:18 +08:00
yanglin
f881eba14f REQ-3045: 减少响应大小 2024-10-23 20:43:54 +08:00
yanglin
4b2e812ee3 REQ-3045: 减少响应大小 2024-10-23 20:43:02 +08:00
yanglin
51dc33ff2b REQ-3045: 减少响应大小 2024-10-23 20:24:15 +08:00
yanglin
57b124ef0f REQ-3045: 减少响应大小 2024-10-23 19:33:29 +08:00
yanglin
623b9ed5d6 REQ-3045: 减少响应大小 2024-10-23 19:28:10 +08:00
yanglin
74dcbb50f5 REQ-3045: 减少响应大小 2024-10-23 19:24:17 +08:00
yanglin
3af80289da REQ-3045: 减少响应大小 2024-10-23 19:18:38 +08:00
yanglin
acffc921cf REQ-3045: 去掉一些无用字段 2024-10-23 18:29:43 +08:00
yanglin
667325c357 REQ-3045: 兼容老属性 2024-10-23 17:58:52 +08:00
yanglin
8271342bf5 REQ-3045: url 2024-10-23 17:24:45 +08:00
yanglin
554ddd8934 REQ-3045: url 2024-10-23 17:24:33 +08:00
yanglin
b7a31fb804 REQ-3045: url 2024-10-23 15:33:45 +08:00
yanglin
a494ecbf7d REQ-3045: url 2024-10-23 15:33:08 +08:00
yanglin
ebde99a40e REQ-3045: url 2024-10-23 15:27:19 +08:00
yanglin
6d08b4ba13 REQ-3045: url 2024-10-23 15:26:57 +08:00
yanglin
6f3ff2695c REQ-3045: url 2024-10-23 15:26:32 +08:00
yanglin
27708ed547 REQ-3045: url 2024-10-23 15:24:30 +08:00
yanglin
14c83f924c REQ-3045: url 2024-10-23 15:11:24 +08:00
yanglin
bd0e7ef922 REQ-3046: cms的IM跳转 2024-10-23 14:59:52 +08:00
yanglin
f98b14c5e5 REQ-3046: cms的IM跳转 2024-10-23 11:50:21 +08:00
yanglin
6a1ff71eed REQ-3046: cms的IM跳转 2024-10-23 11:43:25 +08:00
yanglin
ebfc00d18e REQ-3046: cms的IM跳转 2024-10-23 11:38:35 +08:00
yanglin
2cffc27bbe REQ-3046: fix bug 2024-10-23 10:17:25 +08:00
yanglin
9409f7c08e REQ-2752: fix bug 2024-10-23 09:46:37 +08:00
yanglin
fa69432346 REQ-2752: 查询待办信息 2024-10-23 09:46:34 +08:00
yanglin
70edf626b1 REQ-2752: 查询待办信息 2024-10-23 09:46:32 +08:00
yanglin
7625e4586b REQ-2752: 定义接口 2024-10-23 09:46:26 +08:00
yanglin
e8e7c668a7 REQ-2752: 获取简单的待办信息 2024-10-23 09:46:26 +08:00
yanglin
50bdc09fa7 REQ-3046: fix bug 2024-10-22 18:25:44 +08:00
yanglin
6aac1936a9 Merge branch 'dev' into feature/REQ-3045 2024-10-22 17:37:21 +08:00
yanglin
6b36a1b88b REQ-3046: fix bug 2024-10-22 17:37:17 +08:00
yanglin
fdd64aabe2 Merge branch 'feature/REQ-3045' into dev 2024-10-22 16:46:54 +08:00
yanglin
a4984b06e4 REQ-3046: fix bug 2024-10-22 16:46:46 +08:00
yanglin
e98710a703 REQ-3046: fix bug 2024-10-22 16:46:17 +08:00
yanglin
f93b111a55 Merge branch 'feature/REQ-3045' into dev 2024-10-22 16:21:01 +08:00
yanglin
d0a59ed315 REQ-3046: fix bug 2024-10-22 16:20:55 +08:00
yanglin
9cc79e94ef Merge branch 'feature/REQ-3045' into dev 2024-10-22 15:50:31 +08:00
yanglin
d080e37635 REQ-3046: fix bug 2024-10-22 15:50:25 +08:00
yanglin
f34952b81f Merge branch 'feature/REQ-3045' into dev 2024-10-22 14:22:43 +08:00
yanglin
5db74c0ed9 REQ-3046: 设计分组详情的链接名称 2024-10-22 14:22:35 +08:00
yanglin
f0b67461ad Merge branch 'feature/REQ-3045' into dev 2024-10-22 11:53:10 +08:00
yanglin
0ad0ec336c REQ-3046: 显示在卡片上的按钮 2024-10-22 11:53:00 +08:00
yanglin
38afac7832 Merge branch 'feature/REQ-3045' into dev 2024-10-22 11:10:08 +08:00
yanglin
a8f09a3a10 REQ-3046: 显示在卡片上的按钮 2024-10-22 11:10:02 +08:00
yanglin
966edb034b Merge branch 'feature/REQ-3045' into dev 2024-10-22 11:08:25 +08:00
yanglin
394e60d0cc REQ-3046: 显示在卡片上的按钮 2024-10-22 11:08:16 +08:00
yanglin
b0b208bdb7 Merge branch 'feature/REQ-3045' into dev 2024-10-22 11:04:09 +08:00
yanglin
f32f4fd531 REQ-3046: 显示在卡片上的按钮 2024-10-22 11:04:01 +08:00
yanglin
391461443d Merge branch 'feature/REQ-3045' into dev 2024-10-21 20:44:09 +08:00
yanglin
939ddb6486 REQ-3046: 显示在卡片上的按钮 2024-10-21 20:43:59 +08:00
yanglin
442c06ec48 Merge branch 'feature/REQ-3045' into dev 2024-10-21 20:00:36 +08:00
yanglin
306ec441c6 REQ-3046: 显示在卡片上的按钮 2024-10-21 20:00:31 +08:00
yanglin
d0302ead58 Merge branch 'feature/REQ-3045' into dev 2024-10-21 18:23:14 +08:00
yanglin
666341822b REQ-3046: 显示在卡片上的按钮 2024-10-21 18:23:08 +08:00
yanglin
c7f03a958a Merge branch 'feature/REQ-3045' into dev 2024-10-21 18:13:59 +08:00
yanglin
7114aee478 REQ-3046: 返回前端解析后的URL 2024-10-21 18:13:52 +08:00
yanglin
e7e7194322 Merge branch 'feature/REQ-3045' into dev 2024-10-21 18:12:41 +08:00
yanglin
3af8af6497 REQ-3046: 返回前端解析后的URL 2024-10-21 18:10:46 +08:00
yanglin
acdff78412 Merge branch 'feature/REQ-3045' into dev 2024-10-21 18:10:26 +08:00
yanglin
f54652f55e REQ-3046: 返回前端解析后的URL 2024-10-21 18:10:18 +08:00
yanglin
993f43ad16 Merge branch 'feature/REQ-3045' into dev 2024-10-21 17:58:11 +08:00
yanglin
283a53df85 REQ-3046: 返回手机信息 2024-10-21 17:58:05 +08:00
yanglin
9ce91bd9a9 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java
2024-10-21 17:40:20 +08:00
yanglin
7b26d90dd2 REQ-3046: 返回前端解析后的URL 2024-10-21 17:39:39 +08:00
yanglin
d2f4b448c3 Merge branch 'feature/REQ-3045' into dev 2024-10-21 17:36:28 +08:00
yanglin
0fb9e1229a REQ-3046: 返回前端解析后的URL 2024-10-21 17:36:21 +08:00
yanglin
2d01efc146 REQ-3046: 返回前端解析后的URL 2024-10-21 17:06:28 +08:00
yanglin
9ee6aee99d Merge branch 'feature/REQ-3045' into dev 2024-10-21 16:37:25 +08:00
yanglin
bd2d890eb9 REQ-3046: 返回前端解析后的URL 2024-10-21 16:37:19 +08:00
yanglin
0c7b1d270e Merge branch 'feature/REQ-3045' into dev 2024-10-21 16:15:05 +08:00
yanglin
5d2d2d92d5 REQ-3046: 返回前端解析后的URL 2024-10-21 16:14:59 +08:00
yanglin
796e07fed5 Merge branch 'feature/REQ-2985' into dev 2024-10-21 15:24:37 +08:00
yanglin
1a5730326f REQ-2985: 批量完成待办 2024-10-21 15:24:25 +08:00
yanglin
3929c3a5a3 Merge branch 'feature/REQ-3045' into dev 2024-10-21 15:18:19 +08:00
yanglin
72a2df78a1 REQ-3046: 返回前端解析后的URL 2024-10-21 15:18:10 +08:00
yanglin
aea96bbc6c Merge branch 'feature/REQ-3045' into dev 2024-10-21 14:59:19 +08:00
yanglin
d73bfafb78 REQ-3046: 返回前端解析后的URL 2024-10-21 14:59:14 +08:00
yanglin
6da8956011 Merge branch 'feature/REQ-3045' into dev 2024-10-21 14:32:55 +08:00
yanglin
c7e9b91039 REQ-3046: 返回前端解析后的URL 2024-10-21 14:32:49 +08:00
yanglin
23952dc21d Merge branch 'feature/REQ-3045' into dev 2024-10-18 18:16:55 +08:00
yanglin
831ed996ff REQ-3046: 适配详情 2024-10-18 18:16:49 +08:00
yanglin
70f9124ce4 REQ-3046: 适配详情 2024-10-18 17:46:52 +08:00
yanglin
ca833aaafb Merge branch 'feature/REQ-3045' into dev 2024-10-18 17:41:38 +08:00
yanglin
0fb3bf113a REQ-3046: 适配详情 2024-10-18 17:41:26 +08:00
yanglin
7099f4a2ae Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java
2024-10-18 17:40:10 +08:00
yanglin
d5ba4b339f REQ-3046: 适配详情 2024-10-18 17:39:19 +08:00
yanglin
fceae7a60b Merge branch 'feature/REQ-3045' into dev 2024-10-18 17:27:07 +08:00
yanglin
bacba962ed REQ-3046: 适配详情 2024-10-18 17:26:57 +08:00
yanglin
f3bff6860b REQ-3046: 适配详情 2024-10-18 17:25:38 +08:00
yanglin
b9b5f996fa Merge branch 'feature/REQ-3045' into dev 2024-10-18 16:54:53 +08:00
yanglin
30d8a49c9e REQ-3046: 适配详情 2024-10-18 16:54:44 +08:00
yanglin
89a74f2b30 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java
2024-10-18 14:53:31 +08:00
yanglin
bd5d2e1c68 REQ-3046: 兼容老逻辑 2024-10-18 14:51:14 +08:00
yanglin
bf31ea6f37 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java
2024-10-18 09:31:54 +08:00
yanglin
d5a78772d4 REQ-3046: 设置卡片的跳转 2024-10-17 17:56:14 +08:00
yanglin
13f13ce9a3 REQ-3046: 添加路由参数到query parameter中 2024-10-17 15:36:53 +08:00
yanglin
688b145110 REQ-3046: a lot of staff 2024-10-17 15:27:33 +08:00
yanglin
9b307bb76a REQ-3046: a lot of staff 2024-10-17 15:25:12 +08:00
yanglin
6eb185c1d9 Merge branch 'master' into feature/REQ-3045 2024-10-17 15:03:20 +08:00
yanglin
70f41c6fe4 REQ-3046: a lot of staff 2024-10-17 14:59:27 +08:00
yanglin
be56e0cc06 Merge branch 'feature/REQ-2752' into dev 2024-10-17 14:34:40 +08:00
yanglin
18c6454ab1 REQ-2752: fix bug 2024-10-17 14:34:28 +08:00
yanglin
802917e303 REQ-3046: a lot of staff 2024-10-17 09:55:37 +08:00
yanglin
e1af31200c Merge branch 'feature/REQ-3045' into dev 2024-10-16 18:17:42 +08:00
yanglin
a922791bb8 REQ-3046: backup 2024-10-16 18:17:36 +08:00
yanglin
4e07b0091e Merge branch 'feature/REQ-3045' into dev 2024-10-16 18:16:46 +08:00
yanglin
00b9c6728c REQ-3046: backup 2024-10-16 18:16:34 +08:00
yanglin
14f1d3706f Merge branch 'feature/REQ-2874' into release-20241016
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java
2024-10-16 14:00:20 +08:00
yanglin
8744cd20c5 REQ-3046: backup 2024-10-16 13:59:13 +08:00
yanglin
52daecb38e Merge branch 'feature/REQ-3045' into dev 2024-10-14 15:40:00 +08:00
yanglin
da865253f6 REQ-3046: 准备定义接口 2024-10-14 15:39:52 +08:00
yanglin
5fd6ebb33d Merge branch 'feature/REQ-3045' into dev 2024-10-12 18:17:27 +08:00
yanglin
752aff32e1 REQ-3045: 跳过流程的抄送按钮,他们的链接没有配置,保存的时候校验通不过 2024-10-12 18:17:21 +08:00
yanglin
024c374a11 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:52:29 +08:00
yanglin
acc272577d Merge branch 'feature/REQ-3045' into dev 2024-10-12 17:41:20 +08:00
yanglin
eeb71f3a74 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:41:09 +08:00
yanglin
0dee318578 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:40:44 +08:00
yanglin
4310ac2499 Revert "REQ-3045: 不要在链接中保留过多无用的字段"
This reverts commit cb480144a7.
2024-10-12 17:14:58 +08:00
yanglin
02c030b786 Merge branch 'feature/REQ-3045' into dev 2024-10-12 17:13:43 +08:00
yanglin
cb480144a7 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:13:35 +08:00
yanglin
96b7ffdfbd Merge branch 'feature/REQ-3045' into dev 2024-10-12 16:08:20 +08:00
yanglin
d38145ab3f REQ-3045: 添加校验 2024-10-12 16:08:08 +08:00
yanglin
0304ef583e REQ-3045: fix npe 2024-10-12 16:04:46 +08:00
yanglin
64af3e33c5 REQ-3045: fix npe 2024-10-12 16:04:39 +08:00
yanglin
2340629070 REQ-3045: fix npe 2024-10-12 15:50:01 +08:00
yanglin
54b51446c1 REQ-3045: fix npe 2024-10-12 15:49:28 +08:00
yanglin
61fcaea958 REQ-3045: fix npe 2024-10-12 15:40:54 +08:00
yanglin
6072e594a6 REQ-3045: fix npe 2024-10-12 14:45:54 +08:00
yanglin
e8fce86564 Merge branch 'feature/REQ-3045' into dev 2024-10-12 14:36:48 +08:00
yanglin
88b91be570 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 14:36:36 +08:00
yanglin
f3221353cb Merge branch 'feature/REQ-3045' into dev 2024-10-12 14:34:27 +08:00
yanglin
c8b2fe64e5 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 14:34:10 +08:00
yanglin
ccef3107c8 REQ-3045: 按钮如果没url config就不存了 2024-10-12 14:17:12 +08:00
yanglin
1a94fb03dd Merge branch 'feature/REQ-3045' into dev 2024-10-12 11:19:39 +08:00
yanglin
70e0fb989d REQ-3045: 添加校验 2024-10-12 11:19:32 +08:00
yanglin
e48e791b9e Merge branch 'hoxfix/20241010' into dev 2024-10-12 09:49:36 +08:00
yanglin
6ba31e99b8 hotfix: 更新模版时,不重新生成自定义按钮的code 2024-10-12 09:49:29 +08:00
yanglin
b902ef6a68 hotfix: 更新模版时,不重新生成自定义按钮的code 2024-10-11 19:05:07 +08:00
yanglin
589f919836 Merge branch 'feature/REQ-3045' into dev 2024-10-11 18:08:08 +08:00
xudawei
84e18a4d0b feat:(REQ-3045) 模版管理V3-buttons中加上apiUrl 2024-10-11 18:02:56 +08:00
yanglin
5fdec8e389 Merge branch 'feature/REQ-3045' into dev 2024-10-11 17:56:54 +08:00
yanglin
5c78b6a3ca REQ-2752: 刷审批流程按钮 2024-10-11 17:56:47 +08:00
yanglin
1cc3b3f146 Merge branch 'feature/REQ-3045' into dev 2024-10-11 16:33:41 +08:00
yanglin
4e92024d56 REQ-2752: 刷审批流程按钮 2024-10-11 16:33:34 +08:00
yanglin
6a9cf2f2ef Merge branch 'feature/REQ-3045' into dev 2024-10-11 15:29:15 +08:00
yanglin
ad31d3feba REQ-2752: 刷流程按钮 2024-10-11 15:29:09 +08:00
yanglin
a621d84713 Merge branch 'feature/REQ-3045' into dev 2024-10-11 14:51:10 +08:00
yanglin
4a3171e913 Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-11 14:50:56 +08:00
yanglin
bf10344b62 REQ-2752: a lot of staff 2024-10-11 14:50:54 +08:00
xudawei
6f6e7939aa feat:(REQ-3045) 模版管理V3-page列表增加is_delete过滤条件 2024-10-11 14:19:24 +08:00
xudawei
659d4ae58d feat:(REQ-3045) 模版管理V3-详情按钮中增加identityCode 2024-10-11 13:43:51 +08:00
xudawei
4561291926 feat:(REQ-3045) 模版管理V3-详情按钮中增加identityCode 2024-10-11 11:51:22 +08:00
yanglin
e7036d5a73 Merge branch 'feature/REQ-2752' into dev 2024-10-10 16:22:37 +08:00
yanglin
deb2955285 REQ-2752: 查询待办信息 2024-10-10 16:22:29 +08:00
yanglin
9075739bb7 Merge branch 'feature/REQ-3045' into dev 2024-10-10 16:19:12 +08:00