Commit Graph

119 Commits

Author SHA1 Message Date
yanglin
a610f7ab74 REQ-2497: backup 2024-06-07 18:56:44 +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
62190cf4f4 REQ-2481: 设置模版中IM的发送优先级 2024-05-27 16:31: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
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
9712bb3ffe REQ-2303: 同步显示流程中的自自定义按钮 2024-05-10 16:33:04 +08:00
yanglin
07a1610ed1 REQ-2303: 返回待办业务和路由扩展参数 2024-04-29 11:00:17 +08:00
yanglin
507aee4112 REQ-2411: 发送短信, 限制发送重复内容 2024-04-28 14:40:31 +08:00
yanglin
f00e59a647 REQ-2303: 支持自定义按钮 2024-04-22 20:24:09 +08:00
yanglin
f988245459 REQ-2303: backup 2024-04-22 18:02:44 +08:00
yanglin
03e8aeaf3a REQ-2135: 只有项目才设置发起人项目部名称, 单位的话不返回, 因为会导致待办详情中显示重复的单位信息 2024-04-09 15:21:23 +08:00
yanglin
3daaa2f391 Merge branch 'refs/heads/REQ-2129' into REQ-2135-2129
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
#	inside-notices/src/main/java/cn/axzo/msg/center/mq/RocketMQConfig.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/PresetButtonPressedMessage.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PersonV3DTO.java
2024-04-07 17:05:36 +08:00
yanglin
6dccf6dc34 REQ-2135: 尝试使用查询到的项目部类型 2024-04-07 16:27:24 +08:00
yanglin
198cc6558f REQ-2135: 清理待办日志 2024-04-07 14:01:30 +08:00
yanglin
bb80e882d9 REQ-2135: ignore empty field when parse and serialize JSON 2024-04-03 11:19:26 +08:00
yanglin
19de5ff2df REQ-2135: ignore empty field when parse and serialize JSON 2024-04-03 11:02:37 +08:00
yanglin
949e547a37 REQ-2135: ignore empty field when parse and serialize JSON 2024-04-03 11:00:23 +08:00
yanglin
8bfdc54d20 REQ-2135: 提供更加强大的模版内容解析 2024-04-01 14:04:35 +08:00
yanglin
02d0b6f003 REQ-2135: 添加日志 2024-03-29 09:43:09 +08:00
yanglin
427e5fe0a2 REQ-2135: 完善日志 2024-03-29 09:22:24 +08:00
lilong
1e3cffc844 feat: REQ-2129 解决使用lambdaUpdate更新json的问题 2024-03-28 10:42:09 +08:00
yanglin
87236c31ca REQ-2135: 在待办业务中保存一个样本待办的编码 2024-03-27 17:29:49 +08:00
lilong
2d68cb5171 feat: REQ-2129 消费消息发送mq进行push操作 2024-03-27 14:34:53 +08:00
yanglin
e16b25bd0a REQ-2135: 支持查询分类及子分类的模版 2024-03-26 18:22:19 +08:00
yanglin
3630d12b3b REQ-2135: backup 2024-03-26 17:19:31 +08:00
yanglin
a4243902fd REQ-2135: 调整日志字段 2024-03-26 11:42:21 +08:00
yanglin
92cfe07253 REQ-2135: 调整日志字段 2024-03-26 09:59:57 +08:00
yanglin
4c011c2c91 REQ-2135: backup 2024-03-25 20:23:39 +08:00
yanglin
5c94119d22 REQ-2135: 方方面面 2024-03-25 10:18:04 +08:00
lilong
d7a1917f1f feat: REQ-2129 消息模板增加pushData配置 2024-03-23 10:12:02 +08:00
yanglin
c608e745a1 REQ-2135: 方方面面 2024-03-22 15:42:29 +08:00
yanglin
0bd8c4d17d REQ-2135: 分类统计 2024-03-21 15:33:58 +08:00
yanglin
b91e38c000 REQ-2135: backup 2024-03-21 10:51:56 +08:00
yanglin
dce3ef8fb0 REQ-2135: foo 2024-03-21 09:05:44 +08:00
yanglin
94bb120f14 REQ-2135: backup 2024-03-20 20:48:20 +08:00
yanglin
6de6e9f261 REQ-2135: backup 2024-03-20 18:03:10 +08:00
yanglin
fea0c72259 REQ-2135: backup 2024-03-19 18:53:56 +08:00
yanglin
6e6e84552e REQ-2135: 分页查询 2024-03-18 17:40:46 +08:00
lilong
a09acb3634 feat: BUG-10980 清洗156981aecdea44ab8a969b586dc600dd模板的代办消息 2024-03-18 14:53:15 +08:00
yanglin
d1d69150c5 REQ-2135: 定义接口 2024-03-18 09:25:07 +08:00
yanglin
1261b7dadb REQ-2135: backup 2024-03-15 18:38:56 +08:00
yanglin
650266c830 REQ-2135: 添加接口定义 2024-03-15 13:33:26 +08:00
yanglin
5ff604f1db REQ-2135: 添加实体 2024-03-14 09:15:39 +08:00
lilong
2e992bd23d feat:记录ouId = 0清洗失败的记录 2024-03-06 19:52:23 +08:00
yanglin
d31d54bfbe Merge branch 'feature/REQ-2010' into feature/20240306
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
2024-03-05 20:06:56 +08:00
yanglin
76b40a3819 REQ-2010: 兼容老数据 2024-03-02 14:55:22 +08:00
yanglin
ba37de1a12 REQ-2010: 返回模版类型, 处理按钮可见性问题 2024-03-01 10:21:20 +08:00
lilong
c4b59d9574 feat: 解决通过routerParams里面的taskNo
找到taskOrder的情况
2024-02-28 15:38:07 +08:00
lilong
af0c94b39f feat: router刷新逻辑修改 2024-02-27 17:03:09 +08:00