Commit Graph

485 Commits

Author SHA1 Message Date
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
907aceb505 REQ-2318: 分页查询待办时, 如果没有传端就查询所有端的待办 2024-06-24 09:45:14 +08:00
yanglin
eb661679f3 REQ-2497: 添加一些工具 2024-06-14 14:06:06 +08:00
yanglin
1bb7a7d42a REQ-2497: 待办IM变更通知不回OU 2024-06-07 16:27:28 +08:00
yanglin
b2a6aebd1d REQ-2318: 交接 2024-06-07 14:21:34 +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
17fc08192f REQ-2497: 添加阿里回调 2024-06-06 15:32:06 +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
7706b15206 REQ-2318: 待办状态变更时发送MQ消息通知其它业务方 2024-06-04 10:52:37 +08:00
yanglin
25b2412ae4 REQ-2481: fix imports 2024-06-03 20:10:27 +08:00
yanglin
69b797add6 REQ-2481: 删除无用代码 2024-05-31 16:54:07 +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
9fb2160374 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-23 17:36:17 +08:00
yangqicheng
8692b9812d update - REQ-2324-调整批量设置处理中接口校验 2024-05-23 17:35:46 +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
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
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
yanglin
fdbfe9f795 REQ-2303: 添加政府端 2024-05-17 17:28:25 +08:00
yangqicheng
8b8e26e8b3 update - 消息分类统计接口增加项目部列表参数 2024-05-17 17:11:08 +08:00
yanglin
716e101afa REQ-2318: 定义接口 2024-05-16 15:56:28 +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
yangqicheng
edb2d336bf update - 调整待办接口响应模型业务分类字段名称 2024-05-16 14:27:56 +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
10da6fac15 update - REQ-2324-待办支持批量处理 2024-05-10 17:38:57 +08:00
yanglin
187e47c8ad REQ-2303: 同步显示流程中的自自定义按钮 2024-05-10 17:24:16 +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
44230891aa REQ-2303: 处理流程自定义按钮 2024-05-10 10:30:45 +08:00
yanglin
fcb613d65a REQ-2324: 添加一些方法 2024-05-09 16:56:02 +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
2932c9f84e 发送im消息时去掉执行人personId<0的限制,避免其它人发送失败 2024-05-07 18:55:54 +08:00
yanglin
420a6d01f0 发送im消息时去掉执行人personId<0的限制,避免其它人发送失败 2024-05-07 18:55:10 +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
d2ca950d27 REQ-2405: 处理重复分类问题 2024-04-28 18:39:18 +08:00
yanglin
46184636b9 REQ-2405: 处理cms的老消息读事件 2024-04-28 17:30:43 +08:00
yanglin
a7c1f1364f REQ-2303: 返回业务扩展参数 2024-04-26 18:06:15 +08:00
yanglin
0112de4ab7 REQ-2303: 添加政务工作台类型 2024-04-26 17:28:42 +08:00
yanglin
f3508208e2 REQ-2411: 去掉没用的fallback类 2024-04-26 10:29:22 +08:00
yanglin
16081d590e REQ-2405: 添加一些标识来排查问题 2024-04-26 09:31:55 +08:00
yanglin
789b755c5c REQ-2405: almost there 2024-04-25 18:19:42 +08:00