wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,022 Commits 1 Branch 0 Tags 6.4 MiB
e9fbf930d8
Commit Graph

669 Commits

Author SHA1 Message Date
songyuanlun
50010571fb feat: 按钮操作区域过滤掉不显示在卡片的按钮 2024-01-05 11:29:13 +08:00
songyuanlun
e1983dc811 Merge branch 'master' into feature/REQ-1899-syl 2024-01-04 18:35:24 +08:00
songyuanlun
4e39770e5e feat: 按钮操作区域调整高亮逻辑和新增是否显示在卡片上 2024-01-04 18:33:23 +08:00
宋远伦
544b76f5ff Merge branch 'hotfix-20240104' into 'master' 
feat: treeNode 移除 local cache

See merge request universal/infrastructure/backend/msg-center-plat!241
 2024-01-04 07:06:50 +00:00
宋远伦
95e51a7dc9 Merge branch 'hotfix-20240104' into 'pre' 
Hotfix 20240104

See merge request universal/infrastructure/backend/msg-center-plat!240
 2024-01-03 09:17:24 +00:00
songyuanlun
a8675f9c52 feat: treeNode 移除 local cache 2024-01-02 16:02:26 +08:00
songyuanlun
d30db29015 Merge branch 'master' into feature/REQ-1405 2023-12-28 14:20:35 +08:00
邬宇
4ea9d5506d Merge branch 'feature/REQ-1405' into 'pre' 
Feature/req 1405

See merge request universal/infrastructure/backend/msg-center-plat!236
 2023-12-28 05:27:55 +00:00
邬宇
ccba39454b Merge branch 'feature/REQ-1405-wy' into 'feature/REQ-1405' 
Feature/req 1405 wy

See merge request universal/infrastructure/backend/msg-center-plat!235
 2023-12-28 05:27:38 +00:00
songyuanlun
54936ce8f4 Merge branch 'feature/REQ-1405' into pre 
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageRecordApiImpl.java
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
#	integration-test/src/test/resources/message.http
#	msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageRecordApi.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideMessageRecordApiFallBack.java
 2023-12-28 10:15:09 +08:00
宋远伦
dd88cac12f Merge branch 'feature/REQ-1405-syl' into 'feature/REQ-1405' 
fix: youmeng push add log

See merge request universal/infrastructure/backend/msg-center-plat!232
 2023-12-28 02:08:11 +00: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
邬宇
f156094f30 Merge branch 'feature/REQ-1896' into 'pre' 
Feature/req 1896

See merge request universal/infrastructure/backend/msg-center-plat!227
 2023-12-22 10:29:43 +00:00
wuyu
9ac29b356e +发送im 2023-12-22 16:57:09 +08:00
wuyu
3dc5d449cc +发送im 2023-12-22 15:56:45 +08:00
songyuanlun
d171298a33 fix: youmeng push add log 2023-12-22 15:09:52 +08:00
wuyu
d36eadd4cc +分页总数 2023-12-22 11:21:08 +08:00
宋远伦
1255eeec5e Merge branch 'feature/REQ-1896' into 'pre' 
Feature/req 1896

See merge request universal/infrastructure/backend/msg-center-plat!212
 2023-12-21 06:34:23 +00:00
songyuanlun
47bf695445 fix: 发生im消息打印日志 2023-12-21 14:32:58 +08:00
邬宇
3ad9e8ced9 Merge branch 'feature/REQ-1609-biz-code' into 'pre' 
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!208
 2023-12-20 10:52:15 +00:00
邬宇
65c015b5c5 Merge branch 'feature/REQ-1609-biz-code' into 'master' 
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!207
 2023-12-20 10:50:20 +00:00
wuyu
00d79b5e59 +npe判断 2023-12-20 18:49:49 +08:00
邬宇
fa93db1d25 Merge branch 'feature/REQ-1609-biz-code' into 'pre' 
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!205
 2023-12-20 10:30:18 +00:00
邬宇
aaff6bffb9 Merge branch 'feature/REQ-1609-biz-code' into 'master' 
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!204
 2023-12-20 10:28:55 +00:00
wuyu
45fdc02e13 +npe判断 2023-12-20 18:28:02 +08:00
songyuanlun
9a7911a467 fix: 推送消息打印日志 2023-12-20 16:29:40 +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
宋远伦
8dbf53dfd2 Merge branch 'feature/REQ-1896-syl' into 'pre' 
Feature/req 1896 syl

See merge request universal/infrastructure/backend/msg-center-plat!202
 2023-12-20 01:43: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
songyuanlun
380797b350 fix: 解决历史bug，消息列表过滤条件不生效的问题 2023-12-19 15:50:20 +08:00
songyuanlun
fc630f8250 fix: im消息发送不影响原有消息通道 2023-12-19 12:05:04 +08:00
songyuanlun
093002ee64 feat: 同步relation_template_map 数据脚本到业务事件 2023-12-19 11:37:53 +08:00
songyuanlun
3be07a4dd1 feat: relation_template_map 相关逻辑调整到 业务事件映射表并适配 2023-12-18 20:15:23 +08:00
邬宇
a411748063 Merge branch 'feature/REQ-1609-biz-code' into 'pre' 
Feature/req 1609 biz code

See merge request universal/infrastructure/backend/msg-center-plat!192
 2023-12-18 02:50:04 +00:00
songyuanlun
99e5443483 fix: 处理查询模板时没返回templateCode的问题 2023-12-18 10:00:10 +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
songyuanlun
f530ed70c7 fix: 业务事件分页按照prd的排序规则 2023-12-15 17:16:36 +08:00
songyuanlun
bfad6a44ec feat: 业务事件管理接口调整 2023-12-15 15:34:56 +08:00
songyuanlun
9488b856ff feat: 业务事件管理接口实现 2023-12-15 14:34:39 +08:00
wuyu
94b588a3dc +按钮展示 2023-12-15 11:31:39 +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
邬宇
740decd75b Merge branch 'feature/REQ-1609-wy' into 'pre' 
Feature/req 1609 wy

See merge request universal/infrastructure/backend/msg-center-plat!169
 2023-12-13 08:27:07 +00:00
wuyu
4024e26332 +待办数量 2023-12-13 16:26:02 +08:00
wuyu
75440ff20f +引入包 2023-12-13 15:02:58 +08:00
wuyu
093ae3df7e +修改入参 2023-12-13 15:00:52 +08:00
邬宇
2e09476055 Merge branch 'feature/REQ-1609-wy' into 'pre' 
+ouId处理

See merge request universal/infrastructure/backend/msg-center-plat!164
 2023-12-13 03:26:45 +00:00
wuyu
3c22bd1f1c +ouId处理 2023-12-13 11:26:06 +08:00
邬宇
617e1b177f Merge branch 'feature/REQ-1609-wy' into 'pre' 
+分组条件

See merge request universal/infrastructure/backend/msg-center-plat!163
 2023-12-12 10:51:46 +00:00
wuyu
51406eec06 +分组条件 2023-12-12 18:36:51 +08:00
邬宇
f30213f725 Merge branch 'feature/REQ-1609-wy' into 'pre' 
+流程实例中过滤操作人

See merge request universal/infrastructure/backend/msg-center-plat!157
 2023-12-12 06:23:14 +00:00
wuyu
6aa9ca2d32 +流程实例中过滤操作人 2023-12-12 10:48:54 +08:00
邬宇
d39bd2efce Merge branch 'feature/REQ-1609-wy' into 'pre' 
+添加操作人

See merge request universal/infrastructure/backend/msg-center-plat!153
 2023-12-12 01:55:49 +00:00
wuyu
022723d832 +添加操作人 2023-12-12 09:54:36 +08:00
邬宇
04c3c5fb45 Merge branch 'feature/REQ-1609-wy' into 'pre' 
+添加分页

See merge request universal/infrastructure/backend/msg-center-plat!151
 2023-12-11 09:45:48 +00:00
wuyu
eff9616fde +添加分页 2023-12-11 17:44:43 +08:00
wuyu
5e26189f32 +相同发起人整合 2023-12-11 14:05:51 +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
26d623e8ec +流程待办处理 2023-12-11 14:05:50 +08:00
wuyu
f36787cc71 +子业务编码完成待办 2023-12-11 14:05:49 +08:00
wuyu
a1b37ab447 +班组长ouId 2023-12-11 14:05:48 +08:00
邬宇
a455476ce6 Merge branch 'feature/REQ-1609' into 'pre' 
Feature/req 1609

See merge request universal/infrastructure/backend/msg-center-plat!146
 2023-12-11 05:42:57 +00:00
wuyu
3ff797f2b3 +相同发起人整合 2023-12-09 16:53:34 +08:00
luofu
80a79f8e68 feat(REQ-1609): 待办路由按钮数据模型调整 
背景：
  https://jira.axzo.cn/browse/REQ-1609?goToView=1

影响：
  无
 2023-12-09 16:53:33 +08:00
wuyu
8d27ac7120 +流程待办处理 2023-12-09 16:53:33 +08:00
wuyu
4a831b4cb4 +子业务编码完成待办 2023-12-09 16:53:32 +08:00
luofu
743527d31b Merge branch 'fix/2023-12-08' of axzsource.com:universal/infrastructure/backend/msg-center-plat into pre 2023-12-08 16:41:59 +08:00
luofu
0bd93ae043 fix(fix/2023-12-08): 处理路由拼接的逻辑问题 2023-12-08 16:40:59 +08:00
luofu
b9ab6721f2 feat(REQ-1609): 待办路由按钮数据模型调整 
背景：
  https://jira.axzo.cn/browse/REQ-1609?goToView=1

影响：
  无
 2023-12-08 13:34:25 +08:00
wuyu
d4497907a3 +流程待办处理 2023-12-07 19:18:50 +08:00
wuyu
3cebf96498 +子业务编码完成待办 2023-12-07 15:49:02 +08:00
wuyu
7052cb8dad +班组长OUID 2023-12-06 20:06:53 +08:00
wuyu
02d56a80f9 +班组长ouId 2023-12-06 19:37:58 +08:00
张洁亮
d553bc9132 Merge branch 'feature/REQ-1634' into 'master' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!130
 2023-12-06 07:58:18 +00:00
邬宇
853769dbce Merge branch 'feature/REQ-1634' into 'dev' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!127
 2023-12-05 06:48:40 +00:00
wuyu
76693560f0 +最新bizCode 2023-12-05 14:48:07 +08:00
张洁亮
a271d56572 Merge branch 'feature/REQ-1634' into 'master' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!126
 2023-12-05 06:30:02 +00:00
任鉴非
85ff2ec75f Merge branch 'feature/REQ-1677' into 'master' 
Feature/req 1677

See merge request universal/infrastructure/backend/msg-center-plat!125
 2023-12-05 02:06:46 +00:00
邬宇
d681a60c9b Merge branch 'feature/REQ-1634' into 'dev' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!123
 2023-12-04 06:08:28 +00:00
wuyu
4d1c712bc9 +卡片空过滤 2023-12-01 11:27:14 +08:00
邬宇
2ecfd4daf6 Merge branch 'feature/REQ-1634' into 'dev' 
+重命名

See merge request universal/infrastructure/backend/msg-center-plat!116
 2023-11-30 09:12:42 +00:00
wuyu
89ff7756e7 +重命名 2023-11-30 17:12:18 +08:00
邬宇
abad1bf846 Merge branch 'feature/REQ-1634' into 'dev' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!115
 2023-11-30 08:52:30 +00:00
wuyu
6d248cc46b +通过ID撤销待办 2023-11-30 16:52:01 +08:00
wuyu
68b137e0b9 +历史未完成待办今日完成 2023-11-30 10:46:22 +08:00
邬宇
594bea861f Merge branch 'feature/REQ-1634' into 'dev' 
+bizCode查询

See merge request universal/infrastructure/backend/msg-center-plat!106
 2023-11-30 01:35:33 +00:00
wuyu
86c3bab98d +bizCode查询 2023-11-30 09:34:43 +08:00
邬宇
b97056cee7 Merge branch 'feature/REQ-1634' into 'dev' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!105
 2023-11-29 11:46:53 +00:00
wuyu
ff207f00c9 +bizparam修改 2023-11-29 18:03:53 +08:00
wuyu
67b59aa512 +通过bizCode查找待办 2023-11-29 16:19:46 +08:00
邬宇
57c50b436d Merge branch 'feature/REQ-1634' into 'dev' 
+修改待办

See merge request universal/infrastructure/backend/msg-center-plat!98
 2023-11-28 09:40:19 +00:00
wuyu
d552789e07 +修改待办 2023-11-28 17:39:50 +08:00
邬宇
201c36cc75 Merge branch 'feature/REQ-1634' into 'dev' 
+完成待办处理

See merge request universal/infrastructure/backend/msg-center-plat!97
 2023-11-28 09:00:08 +00:00
wuyu
a05b406ad1 +完成待办处理 2023-11-28 16:59:02 +08:00
邬宇
050e023616 Merge branch 'feature/REQ-1634' into 'dev' 
+待办日历模版配置

See merge request universal/infrastructure/backend/msg-center-plat!96
 2023-11-28 06:47:01 +00:00
wuyu
7c91546ea0 +待办日历模版配置 2023-11-28 14:46:21 +08:00
邬宇
80ca06f7cf Merge branch 'feature/REQ-1634' into 'dev' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!94
 2023-11-28 03:54:54 +00:00
wuyu
c39b4036d6 +去除transit 2023-11-28 11:39:39 +08:00
邬宇
a90582285e Merge branch 'feature/REQ-1634' into 'dev' 
+feign通过ID撤销待办

See merge request universal/infrastructure/backend/msg-center-plat!91
 2023-11-28 03:16:00 +00:00
wuyu
1b3aee5e4e +feign通过ID撤销待办 2023-11-28 11:15:35 +08:00
邬宇
161288b7b6 Merge branch 'feature/REQ-1634' into 'dev' 
+通过ID撤销待办

See merge request universal/infrastructure/backend/msg-center-plat!89
 2023-11-28 02:56:51 +00:00
wuyu
31d181ff88 +通过ID撤销待办 2023-11-28 10:56:17 +08:00
邬宇
ac4d1a97ac Merge branch 'feature/REQ-1634' into 'dev' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!87
 2023-11-27 11:34:07 +00:00
wuyu
7443aea9f1 Revert "+获取人员到msg" 
This reverts commit 7c0e9abc8a.
 2023-11-27 19:33:08 +08:00
wuyu
9e39e50f8a Revert "+参数修改" 
This reverts commit 671845ad7b.
 2023-11-27 19:33:08 +08:00
wuyu
f3e97eeb4c Revert "+controller" 
This reverts commit 024ae4d685.
 2023-11-27 19:33:08 +08:00
邬宇
03052851af Merge branch 'feature/REQ-1634' into 'dev' 
+controller

See merge request universal/infrastructure/backend/msg-center-plat!86
 2023-11-27 10:31:01 +00:00
wuyu
024ae4d685 +controller 2023-11-27 18:01:09 +08:00
邬宇
bc9d594969 Merge branch 'feature/REQ-1634' into 'dev' 
+参数修改

See merge request universal/infrastructure/backend/msg-center-plat!83
 2023-11-27 08:42:50 +00:00
wuyu
671845ad7b +参数修改 2023-11-27 16:42:21 +08:00
邬宇
f2adcaaa5a Merge branch 'feature/REQ-1634' into 'dev' 
+获取人员到msg

See merge request universal/infrastructure/backend/msg-center-plat!82
 2023-11-27 08:25:45 +00:00
wuyu
7c0e9abc8a +获取人员到msg 2023-11-27 16:25:18 +08:00
邬宇
1e06536c15 Merge branch 'feature/REQ-1634' into 'dev' 
+执行人过滤

See merge request universal/infrastructure/backend/msg-center-plat!80
 2023-11-27 05:43:18 +00:00
wuyu
6e458db0e4 +执行人过滤 2023-11-27 13:42:40 +08:00
邬宇
7a6fe352d8 Merge branch 'feature/REQ-1634' into 'dev' 
Feature/req 1634

See merge request universal/infrastructure/backend/msg-center-plat!77
 2023-11-25 05:49:08 +00:00
wuyu
da87be0db5 +待办列表 2023-11-25 13:48:30 +08:00
luofu
ce620d930b feat(REQ-1507): 异步同步数据 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-24 14:07:34 +08:00
罗福
6ca6a85911 Merge branch 'feature/REQ-1507' into 'dev' 
feat(REQ-1507): 异步同步数据

See merge request universal/infrastructure/backend/msg-center-plat!73
 2023-11-24 01:07:08 +00:00
luofu
974227cacb feat(REQ-1507): 异步同步数据 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-24 09:04:47 +08:00
luofu
3c788cfa2a Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-24 09:03:58 +08:00
luofu
2277d5705c feat(REQ-1507): 路由参数拼接问题 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-23 14:40:59 +08:00
luofu
05eebc5f3d Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-23 12:39:18 +08:00
luofu
0512403a9b feat(REQ-1507): 支持企业过滤 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-23 12:38:50 +08:00
wuyu
f9fb1b8a00 +业务未传ouId，才去查总包ouId 2023-11-23 11:34:26 +08:00
luofu
786c3d5160 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-23 10:54:54 +08:00
luofu
e9b7cbbdc9 feat(REQ-1507): 支持企业过滤 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-23 10:39:23 +08:00
luofu
f083282f5f feat(REQ-1507): 支持企业过滤 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-23 10:34:36 +08:00
luofu
ad3815fd79 feat(REQ-1507): 支持企业过滤 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-23 09:02:07 +08:00
luofu
4b59cfb78a feat(REQ-1507): 支持企业过滤 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-22 21:52:48 +08:00
金海洋
8953fb72b4 NPE 2023-11-22 21:32:36 +08:00
宋远伦
891664eb93 Merge branch 'feature/REQ-1677-syl' into 'dev' 
Feature/req 1677 syl

See merge request universal/infrastructure/backend/msg-center-plat!70
 2023-11-22 12:34:53 +00:00
luofu
00cc808847 feat(REQ-1507): 支持企业过滤 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-22 20:12:36 +08:00
luofu
0b71b09375 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-22 18:25:20 +08:00
luofu
01487c0e52 feat(REQ-1507): 支持企业过滤 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-22 18:24:12 +08:00
songyuanlun
eef5c9b854 fix: 发送im消息需要过滤 personId=0 的数据 2023-11-22 17:57:36 +08:00
songyuanlun
3828da2dcf fix: 修复发im消息，未按状态过滤的问题 2023-11-22 17:55:46 +08:00
luofu
32e644c75e feat(REQ-1507): 老的待办数据迁移 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-22 15:51:53 +08:00
luofu
80b28d19af Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-22 15:50:43 +08:00
luofu
50c760cf3f feat(REQ-1507): 老的待办数据迁移 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-22 15:50:23 +08:00
wuyu
548fa33af6 Merge remote-tracking branch 'origin/feature/REQ-1507' into feature/REQ-1507 2023-11-22 15:26:50 +08:00
wuyu
9553b575fc +无单位设置默认 2023-11-22 15:26:41 +08:00
luofu
8f02cd393c Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-22 11:41:49 +08:00
luofu
ff7739e857 feat(REQ-1507): 老的待办数据迁移 
背景：
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响：
  无
 2023-11-22 11:41:19 +08:00
wuyu
5a6ea68d8b +从业人员添加单位 2023-11-22 10:29:39 +08:00
wuyu
9fd7458446 +从业人员添加单位 2023-11-22 10:28:40 +08:00