Commit Graph

511 Commits

Author SHA1 Message Date
邬宇
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
luofu
c18d329881 feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-21 11:13:55 +08:00
luofu
c87a8c09ac feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-21 10:01:42 +08:00
luofu
f6d0e43f07 feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 21:00:11 +08:00
luofu
dd8a33476e feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 16:31:18 +08:00
luofu
cb036a4886 feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 14:31:27 +08:00
luofu
2315c3b091 feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 14:29:52 +08:00
luofu
1f36df1234 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-20 12:20:38 +08:00
luofu
72582e108b feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 12:19:22 +08:00
luofu
f9451ddac2 feat(REQ-1507): 老的待办数据迁移
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 10:09:05 +08:00
luofu
38cb34c4f5 feat(REQ-1507): 待办列表返回值新增模板编码
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 09:03:42 +08:00
luofu
4969c3f732 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-20 08:49:37 +08:00
luofu
fb782f8274 feat(REQ-1507): 待办列表返回值新增模板编码
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-20 08:48:25 +08:00
luofu
961c14ba67 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-18 15:38:08 +08:00
luofu
cf578e2af0 feat(REQ-1507): 待办列表返回值新增模板编码
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-18 15:36:42 +08:00
luofu
908e0a43b8 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-18 09:56:25 +08:00
luofu
fbcdaf1896 feat(REQ-1507): 处理变更模板分类关联关系的BUG
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-18 09:55:27 +08:00
luofu
faba223f4c feat(REQ-1507): 处理变更模板分类关联关系的BUG
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-18 09:53:54 +08:00
luofu
e5499c67f0 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-18 09:18:25 +08:00
luofu
4c42638f3c feat(REQ-1507): 处理变更模板分类关联关系的BUG
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

影响:
  无
2023-11-18 09:17:32 +08:00
luofu
cba5a8d708 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-17 18:22:36 +08:00
luofu
70bf762739 feat(REQ-1507): 分页查询针对选择的分类没有关联任何模板的查询优化
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、分页查询针对选择的分类没有关联任何模板的查询优化;

影响:
  无
2023-11-17 18:14:08 +08:00
luofu
89ddecd8d1 feat(REQ-1507): 分页查询针对选择的分类没有关联任何模板的查询优化
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、分页查询针对选择的分类没有关联任何模板的查询优化;

影响:
  无
2023-11-17 17:20:18 +08:00
zuoqinbo
d1842e4147 feat:同步消息模板 2023-11-17 14:38:20 +08:00
zuoqinbo
be3b796fd6 Merge branch 'feature/REQ-1507' of https://axzsource.com/universal/infrastructure/backend/msg-center-plat into feature/REQ-1507 2023-11-17 11:28:02 +08:00
luofu
09e51fe57f feat(REQ-1507): 数据清洗
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、数据清洗;

影响:
  无
2023-11-17 11:18:10 +08:00
luofu
b9289a023a feat(REQ-1507): 分类结点名称模糊搜索功能
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、分类结点名称模糊搜索功能;

影响:
  无
2023-11-17 09:19:40 +08:00
金海洋
4f2fb86b65 Merge branch 'feature/REQ-1507' into dev 2023-11-16 20:33:15 +08:00
金海洋
c3fb5a57fd 增加待办completeById 接口 2023-11-16 20:33:05 +08:00
luofu
0da6f8a705 feat(REQ-1507): 待办记录新增企业id字段
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、待办记录新增企业id字段;

影响:
  无
2023-11-16 19:56:43 +08:00
luofu
f7cefe3570 feat(REQ-1507): 模板移除分类功能问题处理
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、模板移除分类功能问题处理;

影响:
  无
2023-11-16 19:25:11 +08:00
金海洋
492db78dfa Merge branch 'feature/REQ-1507' into dev 2023-11-16 19:19:26 +08:00
金海洋
a35879f53b Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into feature/REQ-1507 2023-11-16 19:18:56 +08:00
金海洋
4bff192751 PushPendingMessageDTO增加id 2023-11-16 19:18:35 +08:00
luofu
e354051ac2 feat(REQ-1507): 模板移除分类功能问题处理
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、模板移除分类功能问题处理;

影响:
  无
2023-11-16 18:50:57 +08:00
luofu
72bfff945d feat(REQ-1507): 分类结点名称搜索实现
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、分类结点名称搜索实现;

影响:
  无
2023-11-16 18:21:22 +08:00
luofu
edada4a119 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-16 17:16:49 +08:00
luofu
b4317b2d20 feat(REQ-1507): 分类结点名称搜索实现
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、分类结点名称搜索实现;

影响:
  无
2023-11-16 17:16:13 +08:00
luofu
20629211d6 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-16 14:05:24 +08:00
luofu
a9de4e46d7 feat(REQ-1507): 兼容CMS老版本的待办入口
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、兼容CMS老版本的待办入口;

影响:
  无
2023-11-16 14:04:52 +08:00
luofu
97ff8f343b Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-16 13:45:02 +08:00
luofu
4f7658b082 feat(REQ-1507): 兼容工人端APP老版本的待办入口
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、兼容工人端APP老版本的待办入口;

影响:
  无
2023-11-16 13:44:27 +08:00
luofu
40f36b5ff2 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-15 20:38:41 +08:00
luofu
f9de4dfbe8 feat(REQ-1507): 待办记录新增企业id字段
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、待办记录新增企业id字段;

影响:
  无
2023-11-15 20:38:09 +08:00
luofu
794830ff5a Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-15 17:17:15 +08:00
luofu
ef2f9b6c29 feat(REQ-1507): 待办记录新增企业id字段
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、待办记录新增企业id字段;

影响:
  无
2023-11-15 17:16:34 +08:00
金海洋
f82bce3e49 消息push的时候增加ouId参数 2023-11-15 16:58:08 +08:00
金海洋
893888c9eb Merge branch 'feature/REQ-1507' into dev 2023-11-15 15:12:40 +08:00
金海洋
b957924514 修改发送代办接口和新增通过业务编码和模版编码完成待办 和 取消待办 2023-11-15 15:12:13 +08:00
luofu
dc920d3580 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-15 14:16:22 +08:00
luofu
136c163076 feat(REQ-1507): 新增查询树的剪枝接口
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、新增查询树的剪枝接口;

影响:
  无
2023-11-15 14:15:26 +08:00
luofu
cc6ccd18f3 Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-14 17:44:30 +08:00
luofu
6fb60062ed feat(REQ-1507): 新增待办列表查询指定item的接口
背景:
  https://jira.axzo.cn/browse/REQ-1507?goToView=1

修改:

1、新增待办列表查询指定item的接口;

影响:
  无
2023-11-14 17:40:01 +08:00
luofu
26b1ee2221 Merge branch 'fix/2023-11-14' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2023-11-14 14:26:08 +08:00
luofu
b491b63db8 docs(fix/2023-11-14): 增加注释 2023-11-14 14:25:46 +08:00
luofu
09b801455d fix(2023-11-14): cms 去掉将未读的消息排到前面的逻辑
影响:
  cms消息列表
2023-11-14 14:24:31 +08:00