Commit Graph

1481 Commits

Author SHA1 Message Date
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
yanglin
bd3eb78983 REQ-3045: 同步模版基础 2024-10-10 16:19:02 +08:00
yanglin
b64b2c6c93 Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-10 14:17:45 +08:00
yanglin
faf0c2061d Merge branch 'feature/REQ-2752' into dev 2024-10-10 14:17:38 +08:00
yanglin
6c36a1dd91 REQ-2752: 查询待办信息 2024-10-10 14:17:19 +08:00
yanglin
1f4ea41699 REQ-3045: 迁移老模版数据 2024-10-10 13:45:46 +08:00
jinhaiyang
a4b1780e6c Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:39:48 +08:00
jinhaiyang
9dc6ebdcd2 modify pom 2024-10-10 11:39:33 +08:00
yanglin
8ea0038447 hotfix: 更新模版时,不重新生成自定义按钮的code 2024-10-10 11:32:17 +08:00
xudawei
f468efe470 Merge branch 'feature/REQ-3045' into dev 2024-10-09 14:08:28 +08:00
xudawei
166ebf8c21 feat:(REQ-3045) 模版管理V3-优化删除接口 2024-10-09 14:07:55 +08:00
xudawei
8416c9c573 Merge branch 'feature/REQ-3045' into dev 2024-10-09 13:41:32 +08:00
xudawei
4daa135c37 feat:(REQ-3045) 模版管理V3-button列表更换类型属性 2024-10-09 13:40:57 +08:00
xudawei
ec2d053c46 Merge remote-tracking branch 'origin/dev' into dev 2024-10-09 10:20:33 +08:00
xudawei
6843723bb4 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java
2024-10-09 10:20:15 +08:00
xudawei
505a077d4e feat:(REQ-3045) 模版管理V3-优化详情接口 2024-10-09 10:19:05 +08:00
yanglin
0257f5552e Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-09 10:07:23 +08:00
yanglin
5ba5e219dd Merge branch 'feature/REQ-2752' into dev 2024-10-09 10:07:18 +08:00
yanglin
ea5b6f7c5c REQ-2752: 定义接口 2024-10-09 10:07:12 +08:00
xudawei
8aec950777 feat:(REQ-3045) 模版管理V3-日志优化
feat:(REQ-3045) 模版管理V3-增加templateV3属性填充
2024-10-09 09:21:08 +08:00
xudawei
2b9b5fccb3 Merge branch 'feature/REQ-3045' into dev 2024-10-08 23:51:00 +08:00
xudawei
1432d78870 feat:(REQ-3045) 模版管理V3-fix templateV3#cardUrlConfig 2024-10-08 23:50:44 +08:00
xudawei
19e8aef267 Merge branch 'feature/REQ-3045' into dev 2024-10-08 23:38:30 +08:00
xudawei
33cfb806f7 feat:(REQ-3045) 模版管理V3-增加templateV3属性填充 2024-10-08 23:38:14 +08:00
xudawei
4b01e5e414 feat:(REQ-3045) 模版管理V3-日志优化 2024-10-08 23:14:48 +08:00
xudawei
d7b8bdc1c0 feat:(REQ-3045) 模版管理V3-日志优化 2024-10-08 23:13:24 +08:00
xudawei
721f9ea052 Merge branch 'feature/REQ-3045' into dev 2024-10-08 19:20:27 +08:00
xudawei
c72018720c feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 19:18:47 +08:00
yanglin
2cd0d00065 Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-08 18:32:54 +08:00
yanglin
e72fbd74af Merge branch 'feature/REQ-2752' into dev 2024-10-08 18:32:47 +08:00
yanglin
8ab3b5c33c REQ-2752: 获取简单的待办信息 2024-10-08 18:32:40 +08:00
xudawei
ca47831661 Merge branch 'feature/REQ-3045' into dev 2024-10-08 17:25:13 +08:00
xudawei
43ca77e786 feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 17:23:30 +08:00
xudawei
f225f69610 Merge branch 'feature/REQ-3045' into dev 2024-10-08 17:17:11 +08:00
xudawei
f0f1ca54dc feat:(REQ-3045) 模版管理V3-新增/编辑/详情/删除/列表 2024-10-08 17:16:07 +08:00
xudawei
44a8f16042 Merge branch 'feature/REQ-3045' into dev 2024-10-08 15:46:44 +08:00
xudawei
3b7bd94728 feat:(REQ-3045) 模版管理V3-新增接口添加 2024-10-08 15:44:37 +08:00
yanglin
b8dd881c68 Merge branch 'tingyun' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-09-26 15:27:08 +08:00
yanglin
97d25e45b0 Merge branch 'refs/heads/REQ-2723' 2024-09-18 19:15:35 +08:00
yanglin
3f7a720c0b Merge branch 'feature/REQ-2699' into dev 2024-08-28 16:37:47 +08:00
yanglin
e8bfd598e4 REQ-2699: 在待办/消息按钮的url中追加workspaceType=2 2024-08-28 16:35:41 +08:00
yanglin
b3f80a2301 REQ-2699: 在待办/消息按钮的url中追加workspaceType=2 2024-08-28 16:34:45 +08:00
yanglin
bf32fc376b Merge branch 'feature/REQ-2699' into dev 2024-08-28 10:41:07 +08:00
yanglin
04316faa5c REQ-2699: 分类统计手机原生支持workspaceId 2024-08-28 10:40:59 +08:00
yanglin
248a3aefa7 Merge branch 'feature/REQ-2699' into dev 2024-08-27 11:09:50 +08:00
yanglin
965d349669 REQ-2699: 追求workspaceId 2024-08-27 11:09:43 +08:00
yanglin
1b4ed0ce8e REQ-2699: 追求workspaceType=2 2024-08-26 13:50:45 +08:00
yanglin
f2ceb61713 REQ-2699: 追求workspaceType=2 2024-08-26 13:33:41 +08:00
yanglin
13db4222b3 Merge branch 'feature/REQ-2699' into dev 2024-08-26 11:50:57 +08:00
yanglin
0858ffd8df REQ-2699: 追求workspaceType=2 2024-08-26 11:48:33 +08:00
yanglin
a1cc32014e Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 17:40:05 +08:00
yanglin
92fca87f9b REQ-2699: 查询未完成的待办 2024-08-22 17:39:51 +08:00
yanglin
bb7fcfee80 Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 17:38:14 +08:00
yanglin
094792285d REQ-2699: 查询未完成的待办 2024-08-22 17:38:08 +08:00
yanglin
0cd29641ad Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 17:37:06 +08:00
yanglin
33c3c011c9 REQ-2699: 查询未完成的待办 2024-08-22 17:36:49 +08:00
yanglin
303ee09b1a Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 16:05:54 +08:00
yanglin
67445aa65e REQ-2699: 查询未完成的待办 2024-08-22 16:05:48 +08:00
yanglin
362db556c9 REQ-2699: 查询未完成的待办 2024-08-22 16:05:07 +08:00
yanglin
d89c4554ba Revert "REQ-2699: 分页查询支持通过模版编码来匹配"
This reverts commit 718784f6b9.
2024-08-22 15:57:03 +08:00
yanglin
c87adcd322 Merge branch 'refs/heads/feature/REQ-2699' into dev 2024-08-22 14:46:24 +08:00
yanglin
718784f6b9 REQ-2699: 分页查询支持通过模版编码来匹配 2024-08-22 14:45:43 +08:00
yanglin
a1eaced14c Merge branch 'refs/heads/feature/REQ-2874' into dev 2024-08-20 17:07:29 +08:00
yanglin
bcde71c5d7 Revert "发送IM模版消息时, 支持设置发送时间"
This reverts commit d67d1ca3c7.
2024-08-20 16:48:07 +08:00
yanglin
d67d1ca3c7 发送IM模版消息时, 支持设置发送时间 2024-08-19 11:33:09 +08:00
yanglin
c4ef37f291 Merge branch 'refs/heads/master' into REQ-2723 2024-08-19 09:36:20 +08:00
yanglin
940c9c6c9a REQ-2874: 删除无用的代码 2024-08-16 18:07:43 +08:00
yanglin
d3225dc92d REQ-2874: 政务-添加高新区短信渠道 2024-08-16 15:16:13 +08:00
yanglin
c686f1a24d REQ-2874: 政务-添加高新区短信渠道 2024-08-16 14:13:15 +08:00
yanglin
2999274d41 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:29:13 +08:00
yanglin
a698cff631 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:27:37 +08:00
yanglin
9dafa9aa74 REQ-2874: 政务-添加高新区短信渠道 2024-08-16 11:16:46 +08:00
yanglin
53340ab36f REQ-2874: 政务-添加高新区短信渠道 2024-08-16 09:23:13 +08:00
yanglin
af29d71ca5 hotfix: 发送消息时不带模版编码 2024-07-31 15:58:04 +08:00
yanglin
6aa8768d24 hotfix: mysql deadlock issue 2024-07-31 13:41:20 +08:00
yanglin
9f2778ed27 hotfix: mysql deadlock issue 2024-07-31 11:17:39 +08:00
yanglin
89af1222df hotfix: mysql deadlock issue 2024-07-31 11:15:43 +08:00
yanglin
a94238e4fc REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 20:56:33 +08:00
yanglin
1d72fbb986 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 20:28:41 +08:00
yanglin
d56b54efb3 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 16:46:00 +08:00
yanglin
841aa5fb87 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 16:26:51 +08:00
yanglin
024f55b43c REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 16:17:32 +08:00
yanglin
f660d3fb83 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 15:21:51 +08:00
yanglin
277db09425 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 15:19:08 +08:00
yanglin
6d5715d6b8 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 14:21:06 +08:00
yanglin
79315acbf3 REQ-2488: 删除老消息相关代码 2024-07-17 17:42:10 +08:00
yanglin
2ec2ca6c8a Merge branch 'refs/heads/feature/REQ-2601' 2024-07-17 14:30:55 +08:00
yanglin
1bc9bb0e67 Merge branch 'refs/heads/master' into feature/REQ-2655 2024-07-17 09:35:32 +08:00
yanglin
848b70805c REQ-2601: 下线老消息 2024-07-15 09:58:18 +08:00
yanglin
f5f47d8634 通过听云统计接口调用 2024-07-11 17:23:53 +08:00
yanglin
647bd1c10e REQ-2599: cache path for better performance 2024-07-11 14:19:42 +08:00
yanglin
1f12fd5348 REQ-2599: cache path for better performance 2024-07-11 14:18:38 +08:00
yanglin
b312e86d02 REQ-2599: cache path for better performance 2024-07-11 14:11:13 +08:00
yanglin
1d4e1c2e22 REQ-2599: cache path for better performance 2024-07-11 13:52:13 +08:00
yanglin
ecc7a16122 REQ-2599: cache path for better performance 2024-07-11 13:44:52 +08:00
yanglin
dcb5bc0a84 REQ-2599: cache path for better performance 2024-07-11 13:44:03 +08:00
yanglin
55588b89a3 REQ-2599: 接入arthas 2024-07-11 11:20:22 +08:00
yanglin
e1fc4dad26 REQ-2655: 分类统计时对分类进行排序 2024-07-10 15:21:47 +08:00
yanglin
53e199872d REQ-2453: 优化统计 2024-07-10 13:34:59 +08:00
yanglin
936b24eaab REQ-2453: 优化统计 2024-07-10 11:40:02 +08:00
yanglin
24e11ef834 REQ-2453: 优化统计 2024-07-10 11:16:22 +08:00
yanglin
78e96a2a46 REQ-2453: 优化统计 2024-07-10 11:00:42 +08:00
yanglin
4089da7936 REQ-2453: 优化统计 2024-07-10 10:57:40 +08:00
yanglin
03ab3f6621 REQ-2453: 添加日志, 看一下分类统计的命中率 2024-07-10 09:51:11 +08:00
yanglin
686179e8b5 REQ-2453: 添加日志, 看一下分类统计的命中率 2024-07-10 09:49:38 +08:00
yanglin
255f5df11a REQ-2453: 添加日志, 看一下分类统计的命中率 2024-07-10 09:42:03 +08:00
yanglin
a5899e114a REQ-2453: 添加日志, 看一下分类统计的命中率 2024-07-10 09:39:14 +08:00
yanglin
bbc6f3589e REQ-2453: 添加日志, 看一下分类统计的命中率 2024-07-09 18:46:57 +08:00
yanglin
cbd697a651 REQ-2453: 添加日志, 看一下分类统计的命中率 2024-07-09 18:25:09 +08:00
yanglin
94aa632049 Merge branch 'refs/heads/hotfix/20240701-cms-tree' into feature/REQ-2453 2024-07-05 11:35:32 +08:00
yanglin
6a351bc0c0 Merge branch 'refs/heads/master' into feature/REQ-2453 2024-07-05 11:35:25 +08:00
yanglin
9894181872 REQ-2453: 更新日志 2024-07-05 09:47:56 +08:00
yanglin
45cc702f49 待办交接重置code 2024-07-04 18:21:48 +08:00
yanglin
90b1664a56 fix待办push问题 2024-07-04 16:26:10 +08:00
yanglin
9f39e213ed 优化待办分类统计 2024-07-04 14:15:04 +08:00
yanglin
1f4540bad7 优化待办分类统计 2024-07-04 09:23:16 +08:00
yanglin
bfcf3f3402 REQ-2318: 调整缓存失效时间 2024-07-02 14:04:28 +08:00
yanglin
e722b4e997 REQ-2318: 调整缓存失效时间 2024-07-01 14:23:56 +08:00
yanglin
237a9a4f39 REQ-2318: 调整缓存失效时间 2024-07-01 14:23:44 +08:00
yanglin
2c84948d0a REQ-2318: 增大队列 2024-07-01 14:22:11 +08:00
yanglin
efd6cf6ac9 REQ-2318: 增大队列 2024-07-01 14:16:16 +08:00
yanglin
8c64904ba5 REQ-2318: 增大队列 2024-07-01 14:14:06 +08:00
yanglin
739f13d3b7 REQ-2318: 处理类找不到的问题 2024-06-27 14:06:31 +08:00
yanglin
855e19e350 Revert "REQ-2318: 处理类找不到的问题"
This reverts commit cc5b1d2afd.
2024-06-27 14:06:09 +08:00
yanglin
cc5b1d2afd REQ-2318: 处理类找不到的问题 2024-06-27 13:57:58 +08:00
yanglin
5e01e234ad REQ-2318: 转交业务待办不发IM消息,由业务去发,可以统计到所有数量 2024-06-27 11:39:27 +08:00
yanglin
f512168637 REQ-2318: 转交业务待办不发IM消息,由业务去发,可以统计到所有数量 2024-06-27 11:25:20 +08:00
yanglin
b6f8ab38f6 REQ-2453: 小米、oppo推送渠道 2024-06-25 09:51:25 +08:00
yanglin
a17a31fe37 REQ-2453: 小米、oppo推送渠道 2024-06-25 09:48:16 +08:00
yanglin
b54bc68d1a REQ-2453: 小米、oppo推送渠道 2024-06-25 09:45:06 +08:00
yanglin
fac5f16155 REQ-2453: 添加日志 2024-06-24 18:56:52 +08:00
yanglin
d46d357059 REQ-2453: 添加日志 2024-06-24 18:22:26 +08:00
yanglin
0fc83d0ed9 REQ-2453: fix set processing issue 2024-06-24 17:59:04 +08:00
yanglin
9364726a38 REQ-2453: fix wrong imports 2024-06-24 16:12:05 +08:00
yanglin
000f10bc27 REQ-2453: push的时候添加小米和oppo的渠道id 2024-06-24 14:52:29 +08:00
yanglin
6c6d9e0346 REQ-2318: 不再兼容待办ouId=0 2024-06-24 10:49:15 +08:00
yanglin
04361a616b Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoMqBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoPullBroadcaster.java
2024-06-24 10:46:49 +08:00
yanglin
c19c8de162 REQ-2318: 不再兼容待办ouId=0的情况 2024-06-24 10:39:51 +08:00
yanglin
5335d861f8 REQ-2318: fix can't find class issue 2024-06-24 10:28:30 +08:00
yanglin
d44271aad5 REQ-2318: fix can't find class issue 2024-06-24 10:00:57 +08:00
yanglin
54d6f8d405 REQ-2318: fix can't find class issue 2024-06-24 10:00:47 +08:00
yanglin
9c04332e01 REQ-2318: fix typo 2024-06-24 09:49:05 +08:00
yanglin
907aceb505 REQ-2318: 分页查询待办时, 如果没有传端就查询所有端的待办 2024-06-24 09:45:14 +08:00
yanglin
3ac0b2d43e REQ-2497: 添加一些工具 2024-06-17 10:00:57 +08:00
yanglin
c4203b56c8 REQ-2497: 添加一些工具 2024-06-17 09:56:42 +08:00
yanglin
6af5ad39c9 REQ-2497: 添加一些工具 2024-06-17 09:53:43 +08:00
yanglin
0796bc86f6 REQ-2497: 添加一些工具 2024-06-17 09:53:28 +08:00
yanglin
eb661679f3 REQ-2497: 添加一些工具 2024-06-14 14:06:06 +08:00
yanglin
7493d29b28 REQ-2497: 去掉隐藏的查询条件 2024-06-14 10:24:39 +08:00
yanglin
c8d8c4f5d4 REQ-2497: 待办改成左匹配 2024-06-14 10:11:10 +08:00
yanglin
f6ee25c673 REQ-2318: move code to precise location 2024-06-14 09:26:05 +08:00
yanglin
d1509a7ccc REQ-2497: 待办变更通知 2024-06-11 17:10:05 +08:00
yanglin
18a2f1e87d REQ-2497: 待办变更通知 2024-06-11 16:45:06 +08:00
yanglin
7c747ebc64 REQ-2497: 待办变更通知 2024-06-11 14:23:55 +08:00
yanglin
29b1e45ddf REQ-2497: 待办变更通知 2024-06-11 14:17:42 +08:00
yanglin
a610f7ab74 REQ-2497: backup 2024-06-07 18:56:44 +08:00
yanglin
b2c4699447 REQ-2318: update 2024-06-07 16:34:29 +08:00
yanglin
58998e16cb REQ-2497: 待办IM变更通知不回OU 2024-06-07 16:34:16 +08:00
yanglin
1bb7a7d42a REQ-2497: 待办IM变更通知不回OU 2024-06-07 16:27:28 +08:00
yanglin
f9f40ca729 REQ-2318: 交接 2024-06-07 14:39:55 +08:00
yanglin
05b7fc0fc9 REQ-2318: 交接 2024-06-07 14:32:42 +08:00
yanglin
b2a6aebd1d REQ-2318: 交接 2024-06-07 14:21:34 +08:00
yanglin
8e4588f7e7 REQ-2318: fix imports 2024-06-07 09:13:58 +08:00
yanglin
250d760c8c Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/person/PersonService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/PendingMessageStateEnum.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
2024-06-07 09:12:42 +08:00
yanglin
2ac3e81f80 REQ-2318: 调整名称 2024-06-06 18:19:59 +08:00
yanglin
6a9ca8f148 REQ-2497: 调整IM模版优先级逻辑 2024-06-06 14:33:27 +08:00
yanglin
79f561dfe8 Merge remote-tracking branch 'refs/remotes/origin/feature/merged_all_req'
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java
#	msg-notices/msg-notices-integration/src/main/java/cn/axzo/msg/center/notices/integration/client/impl/AliYunSmsClientImpl.java
2024-06-05 18:25:49 +08:00
yanglin
894e448ee0 REQ-2318: 待办状态变更时发送MQ消息通知其它业务方 2024-06-04 14:40:42 +08:00
yanglin
7706b15206 REQ-2318: 待办状态变更时发送MQ消息通知其它业务方 2024-06-04 10:52:37 +08:00
yanglin
8088940f73 REQ-2481: fix imports 2024-06-04 09:09:27 +08:00
yanglin
d3cea06b5e REQ-2318: 多端支持 2024-06-03 19:57:44 +08:00
yanglin
5f5bd8b019 REQ-2481: 删除无用代码 2024-05-31 17:22:11 +08:00
yanglin
8407f37363 REQ-2481: 删除无用代码 2024-05-31 17:03:28 +08:00
yanglin
506811bd00 REQ-2481: fix bugs 2024-05-30 18:10:37 +08:00
yanglin
f609230f82 REQ-2481: 添加内部方法 2024-05-28 16:58:58 +08:00
yanglin
b3dcf3b84b REQ-2481: 添加内部方法 2024-05-28 16:25:51 +08:00
yanglin
f4d6b1ec96 REQ-2481: 设置模版中IM的发送优先级 2024-05-28 15:49:54 +08:00
yanglin
6108d453b4 REQ-2481: 设置模版中IM的发送优先级 2024-05-28 15:42:52 +08:00
yanglin
144267c3cb REQ-2481: 设置模版中IM的发送优先级 2024-05-28 15:42:44 +08:00
yanglin
9a21327e1b REQ-2481: 设置模版中IM的发送优先级 2024-05-28 15:42:15 +08:00
yanglin
4083186029 REQ-2481: 设置模版中IM的发送优先级 2024-05-27 16:39:13 +08:00
yanglin
62190cf4f4 REQ-2481: 设置模版中IM的发送优先级 2024-05-27 16:31:01 +08:00
yangqicheng
c2860ec6bd Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-23 18:10:18 +08:00
yangqicheng
c632a5de5b update - REQ-2324-调整批量设置处理中接口 2024-05-23 18:06:45 +08:00
yangqicheng
27939442b2 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-23 16:55:05 +08:00
yangqicheng
839139eb26 update - REQ-2324-批量设置待办为审批中接口增加subBizCodes参数 2024-05-23 16:53:01 +08:00
yangqicheng
5d72d5315a Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-23 10:00:39 +08:00
yangqicheng
f24683c368 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/PendingMessagePushParam.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePushRequest.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
2024-05-23 09:50:49 +08:00
yanglin
7f227a4e8d Merge branch 'REQ-2324' of axzsource.com:universal/infrastructure/backend/msg-center-plat into REQ-2324 2024-05-23 09:18:21 +08:00
yanglin
3b783a3afa REQ-2324: fix npe 2024-05-23 09:18:16 +08:00
yangqicheng
2c4f936981 update - REQ-2324-待办计数缓存key增加workspaceId维度 2024-05-22 16:50:58 +08:00
yangqicheng
ce69cb1f99 Merge remote-tracking branch 'refs/remotes/origin/master' into REQ-2324
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
2024-05-22 16:45:08 +08:00
yanglin
0ac817d9b4 REQ-2318: 多端支持 2024-05-22 14:45:28 +08:00
yanglin
68ac34cc2b REQ-2318: 待办交接,端相关 2024-05-22 10:00:44 +08:00
yanglin
f9a2c4f9ec REQ-2318: 待办交接,端相关 2024-05-21 18:51:25 +08:00
yanglin
134d1db0f3 REQ-2318: 交接 2024-05-21 10:51:40 +08:00
yangqicheng
8b8e26e8b3 update - 消息分类统计接口增加项目部列表参数 2024-05-17 17:11:08 +08:00
yanglin
7634c70ad3 REQ-2318: 定义接口 2024-05-16 15:55:16 +08:00
yanglin
a54694c553 REQ-2318: 定义接口 2024-05-16 15:51:32 +08:00
yanglin
184e389fbf REQ-2324: 调整代码 2024-05-13 19:54:19 +08:00
yangqicheng
8319075251 update - REQ-2324-流程批量操作不判断是存在"同意"/"驳回"按钮 2024-05-13 17:34:50 +08:00
yangqicheng
c4aef4b32a update - REQ-2324-调整设置待办为执行中参数为空抛出异常 2024-05-13 14:20:22 +08:00
yangqicheng
4e30d009f8 update - REQ-2324-调整设置待办为执行中代码,设置成功记录日志表 2024-05-13 11:48:28 +08:00
yangqicheng
58bbaab61e update - REQ-2324-添加批量设置待办为处理中接口 2024-05-11 17:58:08 +08:00
yanglin
7dc22eec53 Merge branch 'refs/heads/master' into REQ-2303
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
2024-05-11 16:51:24 +08:00
yangqicheng
b0faed541b update - REQ-2324-修复批量处理问题 2024-05-11 09:51:19 +08:00
yangqicheng
ea9e3322cb update - REQ-2324-业务待办设置是否批量字段 2024-05-10 18:49:25 +08:00
yanglin
c58f465729 REQ-2405: 延迟 2024-05-10 17:49:18 +08:00
yangqicheng
10da6fac15 update - REQ-2324-待办支持批量处理 2024-05-10 17:38:57 +08:00
yanglin
9712bb3ffe REQ-2303: 同步显示流程中的自自定义按钮 2024-05-10 16:33:04 +08:00
yangqicheng
9a5dc1dfe5 update - REQ-2324-增加恢复待办接口 2024-05-10 15:49:38 +08:00
yanglin
6f615eccf8 REQ-2405: 老消息设置已读时不带自然人id条件, 通过主键更新即可。 2024-05-10 15:14:22 +08:00
yanglin
fcb613d65a REQ-2324: 添加一些方法 2024-05-09 16:56:02 +08:00
yanglin
5f7d976236 REQ-2405: 通过api的方式触发归档老消息 2024-05-09 10:06:56 +08:00
yanglin
93de73f346 Merge branch 'refs/heads/master' into REQ-2405
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-05-09 09:54:14 +08:00
yanglin
fdeae8937b REQ-2411: 读取nacos配置 2024-05-08 14:13:21 +08:00
yanglin
dd1ecdf37b REQ-2448: 迁移老的消息 2024-05-08 11:41:40 +08:00
yanglin
72c93d96fd REQ-2448: 迁移老的消息 2024-05-08 11:08:29 +08:00
yanglin
dea3914bb0 REQ-2448: 迁移老的消息 2024-05-08 11:07:35 +08:00
yanglin
dd8c27d87f 发送IM给管理端时, 对ouId和personId去重 2024-05-08 10:28:01 +08:00
yanglin
e977cc5bbe BUG-12572: 给cm发消息时,按人做过滤 2024-05-07 11:38:01 +08:00
yanglin
8a452b8439 REQ-2405: fix bugs 2024-04-30 17:24:45 +08:00
yanglin
ffd688c7ad REQ-2405: 动态替换表名的mybatis插件 - 70% 2024-04-30 15:15:30 +08:00
yanglin
df68d95fad REQ-2405: 调整缓存的过期时间 2024-04-29 15:18:59 +08:00
yanglin
07a1610ed1 REQ-2303: 返回待办业务和路由扩展参数 2024-04-29 11:00:17 +08:00
yanglin
37496f5138 REQ-2405: 处理重复分类问题 2024-04-29 08:48:42 +08:00
yanglin
3c71b4f751 REQ-2405: 处理重复分类问题 2024-04-28 18:53:33 +08:00
yanglin
2d97bb4b36 REQ-2405: 处理重复分类问题 2024-04-28 18:47:37 +08:00
yanglin
d2ca950d27 REQ-2405: 处理重复分类问题 2024-04-28 18:39:18 +08:00