Commit Graph

497 Commits

Author SHA1 Message Date
yanglin
55c1c2da23 REQ-2135: 去掉一些无用的字段 2024-03-29 16:38:00 +08:00
yanglin
30745aa610 REQ-2135: a lot of staff 2024-03-29 16:27:53 +08:00
yanglin
e8e2b15ffa REQ-2135: a lot of staff 2024-03-29 15:59:33 +08:00
yanglin
a91db7ee22 REQ-2135: 查询工人类型 2024-03-29 14:09:05 +08:00
yanglin
b7444f1b1a REQ-2135: 定义接口 2024-03-29 12:17:07 +08:00
yanglin
427e5fe0a2 REQ-2135: 完善日志 2024-03-29 09:22:24 +08:00
yanglin
3ed14f3e96 REQ-2135: fix bugs 2024-03-28 18:49:32 +08:00
yanglin
0395be98b0 REQ-2135: backup 2024-03-28 18:27:29 +08:00
lilong
0ca81c41a3 feat: REQ-2129 友盟增加消息类型 2024-03-28 14:29:45 +08:00
yanglin
8ab4c1bdec REQ-2135: 默认设置开启分析 2024-03-28 11:15:37 +08:00
yanglin
05b87b3ab1 REQ-2135: 默认设置开启分析 2024-03-28 10:46:29 +08:00
yanglin
4cff508613 REQ-2135: 返回更多有用的内容 2024-03-28 10:32:09 +08:00
yanglin
9c392dd8ce REQ-2135: 返回正确的内容 2024-03-27 20:00:40 +08:00
lilong
001254de09 feat: REQ-2129 发送push时增加ouId 2024-03-27 19:48:09 +08:00
yanglin
b99d370896 REQ-2135: fix typo 2024-03-27 18:20:35 +08:00
yanglin
87cd4772e0 REQ-2135: 审批待办查询可执行的详情 2024-03-27 18:19:28 +08:00
lilong
4015afc7f7 feat: REQ-2129 消息模板增加查询是否开启push的查询条件,修改push的aliasType 2024-03-27 17:42:22 +08:00
yanglin
f770461f67 REQ-2135: 方方面面 2024-03-27 15:15:27 +08:00
yanglin
7f943d147f REQ-2135: 多返回一些字段, 用于排查问题 2024-03-27 14:46:56 +08:00
lilong
2d68cb5171 feat: REQ-2129 消费消息发送mq进行push操作 2024-03-27 14:34:53 +08:00
yanglin
0714b1f3b9 REQ-2135: 调整按钮验证逻辑 2024-03-27 13:58:07 +08:00
yanglin
29612f2b16 REQ-2135: 返回正确的内容 2024-03-26 19:59:56 +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
b0923fbe47 REQ-2135: 细化日志类型 2024-03-25 18:05:19 +08:00
yanglin
fcdc456774 REQ-2135: fix bugs 2024-03-25 17:46:21 +08:00
yanglin
0b57b0f877 REQ-2135: 文文面面 2024-03-25 15:12:26 +08:00
yanglin
e4455459c9 REQ-2135: 用统一的方法发送消息 2024-03-25 14:09:35 +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
848827ad18 REQ-2135: backup 2024-03-21 11:20:59 +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
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
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
115bcb0db6 REQ-2010: 查询待办 2024-03-05 17:09:42 +08:00
yanglin
09cfa2f7b1 REQ-2010: 通过personId获取待办 2024-03-05 16:23:02 +08:00
yanglin
a9a38d1746 REQ-2010: 通过personId获取待办 2024-03-05 16:21:17 +08:00
yanglin
389f50b82d REQ-2010: 验证接收者id不能为0 2024-03-04 15:52:19 +08:00
yanglin
76b40a3819 REQ-2010: 兼容老数据 2024-03-02 14:55:22 +08:00
yanglin
c2013a81bf REQ-2010: 添加校验 2024-03-02 13:58:21 +08:00
yanglin
ba37de1a12 REQ-2010: 返回模版类型, 处理按钮可见性问题 2024-03-01 10:21:20 +08:00
李龙
5b0f980f74 Merge branch 'pre' into 'ou_id_migration'
# Conflicts:
#   inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
#   start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
2024-02-29 02:32:07 +00:00
yanglin
66ecd05071 REQ-2010: 根据手机查询用户im消息 2024-02-28 18:29:00 +08:00
yanglin
3b150452cc REQ-2010: 设置返回的数据数量限制 2024-02-28 16:38:50 +08:00
yanglin
f07cb76a3c REQ-2010: 添加分析问题的字段 2024-02-28 16:25:41 +08:00
yanglin
f02c02c6f5 REQ-2010: 添加分析问题的字段 2024-02-28 16:03:33 +08:00
yanglin
8bace30418 REQ-2010: fix bugs 2024-02-27 18:33:15 +08:00
李龙
37a16239d0 Merge branch 'test' into 'ou_id_migration'
# Conflicts:
#   inside-notices/pom.xml
#   inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
#   start/src/main/resources/bootstrap.yml
#   start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
2024-02-27 03:07:51 +00:00
yanglin
2ab6307ea4 REQ-2010: 添加辅助方法 2024-02-27 10:52:27 +08:00
yanglin
94fe53c1ff REQ-2010: 添加辅助方法 2024-02-27 10:38:24 +08:00
yanglin
808c123044 REQ-2010: 添加辅助方法 2024-02-27 10:18:06 +08:00
yanglin
9c23f07507 REQ-2010: 添加辅助方法 2024-02-27 09:46:52 +08:00
yanglin
be5cf2b39e REQ-2010: 添加辅助方法 2024-02-27 09:38:59 +08:00
yanglin
632f0b4f55 REQ-2010: 返回分析信息 2024-02-27 09:20:25 +08:00
yanglin
c6d35eacbd 返回排查问题的字段 2024-02-26 23:38:07 +08:00
yanglin
74093e4045 提供接口查询某个模版的所有待办 2024-02-26 14:36:05 +08:00
yanglin
cc5cd5687a REQ-2010: 刷ouId 2024-02-26 11:32:09 +08:00
yanglin
498cad19b4 REQ-2010: fix NPE 2024-02-26 09:09:56 +08:00
yanglin
c5616f1951 REQ-2010: 修复入参可能不填的问题 2024-02-20 11:10:00 +08:00
yanglin
31bc123ab0 REQ-2097: 添加日志 2024-01-30 19:31:36 +08:00
yanglin
ff2a327f44 Merge branch 'feature/REQ-2097' into pre 2024-01-30 18:30:08 +08:00
yanglin
508b8ab47d REQ-2097: setHide using single parameter 2024-01-30 18:30:01 +08:00
yanglin
a1fce83f12 Merge branch 'feature/REQ-2097' into pre 2024-01-30 15:16:32 +08:00
yanglin
35d2fae3b7 REQ-2097: 根据subBizCode隐藏待办 2024-01-30 10:03:53 +08:00
yanglin
1ef149a61e REQ-2097: 尝试重新编译 2024-01-29 20:41:26 +08:00
yanglin
780c6b59ef REQ-2097: 添加字段, 支持待办在一定时间内隐藏. 主要是为了兼容流程中异步调用待办接口。 2024-01-29 18:04:45 +08:00
yanglin
9f0dadbb52 Merge branch 'hotfix-20260126-constructor-issue' into pre 2024-01-27 14:08:38 +08:00
yanglin
4b43bedf5e hotfix: add @RequestBody 2024-01-27 14:08:12 +08:00
yanglin
9b1b64f443 Merge branch 'feature/REQ-2046' into pre 2024-01-27 09:47:03 +08:00
yanglin
89657feb18 REQ-2046: 兼容老的字段 2024-01-27 09:46:52 +08:00
杨林
12ea8eed26 Merge branch 'hotfix-20260126-constructor-issue' into 'pre'
Hotfix 20260126 constructor issue

See merge request universal/infrastructure/backend/msg-center-plat!336
2024-01-26 02:39:21 +00:00
yanglin
9a5aaead19 hotfix-20260126-constructor-issue: 修复构造函数的问题 2024-01-26 10:38:01 +08:00
yanglin
5a15941672 hotfix-20260126-constructor-issue: 修复构造函数的问题 2024-01-26 10:36:49 +08:00
杨林
2377ab2074 Merge branch 'feature/REQ-2046' into 'pre'
Feature/req 2046

See merge request universal/infrastructure/backend/msg-center-plat!332
2024-01-25 02:27:19 +00:00
yanglin
efb2ca2121 REQ-2046: jar兼容 2024-01-25 10:26:32 +08:00
yanglin
2434c1b847 REQ-2046: make elements @Deprecated 2024-01-25 08:34:53 +08:00
yanglin
b8c9248256 REQ-2046: 兼容router config无法找到的数据 2024-01-25 08:33:13 +08:00
yanglin
0988f3a37e REQ-2046: 恢复一些字段 2024-01-24 20:14:42 +08:00
yanglin
a325273332 REQ-2046: 恢复一些字段 2024-01-24 20:11:24 +08:00
yanglin
66cce36d81 REQ-1858: 添加已终止状态 2024-01-24 18:23:49 +08:00
yanglin
52f1681fe5 REQ-1858: 解决统计未读数据和分页查询数据数据不匹配的问题(两边的查询条件没有保持一致) 2024-01-24 18:10:27 +08:00
yanglin
63fe60b5ed REQ-1858: 多身份查询老消息 2024-01-24 16:57:45 +08:00
杨林
e426fb0ab5 Merge branch 'feature/REQ-1858' into 'pre'
REQ-1858: 给PersonV3DTO添加无参构造函数

See merge request universal/infrastructure/backend/msg-center-plat!326
2024-01-23 03:53:09 +00:00
yanglin
13ccca1e45 REQ-1858: 给PersonV3DTO添加无参构造函数 2024-01-23 11:51:49 +08:00
yanglin
76d5a5cb9d REQ-2090: 业务终状(BizFinalStateEnum)添加已终止状态(ABORTED) 2024-01-22 16:31:43 +08:00
yanglin
8fae3cca28 REQ-1898: 调整返回的数据格式 2024-01-17 09:47:53 +08:00
yanglin
551279e1bc REQ-1898: 调整返回的数据格式 2024-01-17 09:40:32 +08:00
yanglin
f375908b9b REQ-1898: 调整返回的数据格式 2024-01-17 09:35:41 +08:00
yanglin
cfeb4e6e9d REQ-1898: 添加辅助方法 2024-01-17 08:53:57 +08:00
yanglin
2dc91aff4a REQ-1898: 更新元素名称 2024-01-17 08:51:28 +08:00
yanglin
9427856bf8 REQ-1898: 返回请求的批次号 2024-01-16 11:15:04 +08:00
yanglin
63675a63dc REQ-1898: 更新字段名称 2024-01-16 11:05:48 +08:00
yanglin
d629da43c2 REQ-1898: 去掉身份字段 2024-01-15 19:55:01 +08:00
yanglin
a1a386580c REQ-1898: 去掉身份字段 2024-01-15 18:30:23 +08:00
yanglin
d462dae949 REQ-1898: 调整渠道参数 2024-01-15 16:43:09 +08:00
yanglin
e3b06af571 REQ-1898: 请求添加渠道参数 2024-01-15 15:39:59 +08:00
yanglin
b5c40ba7f7 REQ-1898: 请求添加渠道参数 2024-01-15 15:39:45 +08:00
yanglin
4e24e17e2f REQ-1898: 先删除待办相关的参数 2024-01-14 18:18:11 +08:00
yanglin
9bfca165e2 REQ-1898: 调整接口返回模型 2024-01-14 17:29:29 +08:00
yanglin
4ae7ed98ef REQ-1898: 调整字段和日志 2024-01-14 16:49:08 +08:00
yanglin
95f211be5e REQ-1898: 通过新接口发送消息 2024-01-14 16:14:00 +08:00
yanglin
7d7dde85af REQ-1898: 通过新接口发送消息 2024-01-14 15:49:23 +08:00
yanglin
31f413f7e6 暂存一下 2024-01-12 19:14:38 +08:00
songyuanlun
5ce054cbd3 feat: 完成消息企业隔离表结构、接口设计以及部分实现 2024-01-12 10:23:38 +08:00
songyuanlun
d30db29015 Merge branch 'master' into feature/REQ-1405 2023-12-28 14:20:35 +08:00
songyuanlun
7ac213fa8a Merge branch 'master' into feature/REQ-1405 2023-12-25 09:49:47 +08:00
songyuanlun
3fe5d49fdf Merge branch 'master' into feature/REQ-1896 2023-12-25 09:49:05 +08:00
王粒
dad7ec7432 Merge branch 'feature/REQ-1609-biz-code' into 'master'
Feature/req 1609 biz code

See merge request universal/infrastructure/backend/msg-center-plat!203
2023-12-20 06:32:11 +00:00
songyuanlun
ebc8c13c3b feat: 添加更新语音文件api 2023-12-19 18:21:23 +08:00
展思虎
7d2025b91d Merge branch 'release/20231106' into 'master'
Release/20231106

See merge request universal/infrastructure/backend/msg-center-plat!201
2023-12-19 08:09:59 +00:00
宋远伦
18c01198e0 Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
fix: 处理查询模板时没返回templateCode的问题

See merge request universal/infrastructure/backend/msg-center-plat!190
2023-12-19 04:07:03 +00:00
wuyu
d3b821780e Merge branch 'feature/REQ-1896-wy' into feature/REQ-1896
# Conflicts:
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java
2023-12-19 10:12:27 +08:00
wuyu
36f904aa3e +btn设置 2023-12-19 09:47:14 +08:00
wuyu
6ddbd526c2 +详情按钮 2023-12-19 09:47:14 +08:00
songyuanlun
3be07a4dd1 feat: relation_template_map 相关逻辑调整到 业务事件映射表并适配 2023-12-18 20:15:23 +08:00
songyuanlun
239032355d feat: 提供消息模板查询和同步接口 2023-12-16 15:55:56 +08:00
wuyu
bb0bcdae74 +待办终态定义 2023-12-15 18:40:05 +08:00
wuyu
cc094b8703 +待办终态 2023-12-15 17:43:44 +08:00
wuyu
3152bd5fa8 +按钮展示权限 2023-12-15 16:02:45 +08:00
songyuanlun
bfad6a44ec feat: 业务事件管理接口调整 2023-12-15 15:34:56 +08:00
songyuanlun
2eee05b990 feat: 业务事件接口定义 2023-12-15 14:32:10 +08:00
wuyu
dd809bbafc +btn设置 2023-12-14 16:17:01 +08:00
wuyu
811e02d3c3 Merge remote-tracking branch 'origin/feature/REQ-1896' into feature/REQ-1896 2023-12-14 09:54:16 +08:00
wuyu
fb07deee6c +详情按钮 2023-12-14 09:54:00 +08:00
wuyu
093ae3df7e +修改入参 2023-12-13 15:00:52 +08:00
wuyu
022723d832 +添加操作人 2023-12-12 09:54:36 +08:00
luofu
3536a764f8 feat(REQ-1609): 待办路由按钮数据模型调整
背景:
  https://jira.axzo.cn/browse/REQ-1609?goToView=1

影响:
  无
2023-12-11 14:05:50 +08:00
wuyu
f36787cc71 +子业务编码完成待办 2023-12-11 14:05:49 +08:00
wuyu
1515b855ec +新任务360 2023-12-06 15:56:23 +08:00
wuyu
275fce053b +路由key 2023-12-04 14:07:51 +08:00
wuyu
89ff7756e7 +重命名 2023-11-30 17:12:18 +08:00
wuyu
6d248cc46b +通过ID撤销待办 2023-11-30 16:52:01 +08:00
wuyu
86c3bab98d +bizCode查询 2023-11-30 09:34:43 +08:00
wuyu
b9a04b94de +考勤模版 2023-11-29 18:07:44 +08:00
wuyu
67b59aa512 +通过bizCode查找待办 2023-11-29 16:19:46 +08:00
wuyu
d552789e07 +修改待办 2023-11-28 17:39:50 +08:00
wuyu
7c91546ea0 +待办日历模版配置 2023-11-28 14:46:21 +08:00
wuyu
9748542207 +添加url 2023-11-28 11:54:33 +08:00
wuyu
1b3aee5e4e +feign通过ID撤销待办 2023-11-28 11:15:35 +08:00