Commit Graph

1998 Commits

Author SHA1 Message Date
62be14b043 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 17:44:14 +08:00
5b2c3d7385 Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 17:44:01 +08:00
4dcd907956 feat(REQ-2924) - 修复查询出来的审批人,需要先补全头像信息,但数据不合规导致异常的问题 2024-10-11 17:38:33 +08:00
1b11d7ce4a feat(REQ-2924) - 修复查询出来的审批人,需要先补全头像信息,但数据不合规导致异常的问题 2024-10-11 17:30:32 +08:00
yangqicheng
9c58bb78a1 REQ-2752-对外暴露获取流程实例正在审核人列表api 2024-10-11 17:26:02 +08:00
2dad84d1b1 feat(REQ-2924) - 调整一些逻辑 2024-10-11 17:18:20 +08:00
65d96ff5a1 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 16:05:07 +08:00
6e1c58ccc3 feat(REQ-2924) - 调整删除索引的索引名读取 2024-10-11 16:04:45 +08:00
yangqicheng
896f5f4a8a REQ-2752-增加管理员转交按钮枚举 2024-10-11 15:49:44 +08:00
e5149e7c42 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 15:33:54 +08:00
e584988228 feat(REQ-2924) - 同步 ES 的属性补全 2024-10-11 15:31:27 +08:00
6fc354683f Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 15:11:44 +08:00
97ac409d00 feat(REQ-2924) - 调整一些 ERROR 级别的日志打印 2024-10-11 15:10:46 +08:00
0eef59d55b Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 14:58:34 +08:00
yangqicheng
cc79a7b3f7 REQ-2752-修复查询流程管理员异常问题 2024-10-11 13:57:37 +08:00
ce5b934340 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 13:33:22 +08:00
yangqicheng
ce627a6bc8 REQ-2752-增加流程管理员数量校验,修复管理员查询数据问题 2024-10-11 11:53:49 +08:00
1205047cc8 Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 11:29:27 +08:00
d19e63c077 feat(REQ-2752) - 调整开关的逻辑 2024-10-11 11:29:14 +08:00
e2163bad34 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 11:24:55 +08:00
3e464bf108 feat(REQ-2752) - 优化导入 2024-10-11 11:24:32 +08:00
yangqicheng
4367fa2f13 REQ-2752-管理员配置数据查询,排除已删除数据 2024-10-11 10:42:17 +08:00
d6b523e658 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-10 15:36:40 +08:00
25030ce5aa feat(REQ-2752) - 调整同步 ES 数据的内部逻辑, 增加日志 2024-10-10 15:36:16 +08:00
d5104b8ac2 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-10 10:28:27 +08:00
dbac78dc18 feat(REQ-2752) - 调整同步 ES 数据的内部逻辑, 增加日志 2024-10-10 10:28:13 +08:00
c5ed689782 feat(REQ-2752) - 调整同步 ES 数据的内部逻辑, 增加日志 2024-10-10 10:27:52 +08:00
bb21ff4c18 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 20:43:24 +08:00
50dca33685 feat(REQ-2752) - 调整同步 ES 数据的内部逻辑, 增加日志 2024-10-09 20:43:13 +08:00
933f982b9d Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 20:30:47 +08:00
9df48637b8 feat(REQ-2752) - 调整同步 ES 数据的内部逻辑 2024-10-09 20:30:34 +08:00
d6fda1108f Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 18:25:40 +08:00
56b68e5fe7 feat(REQ-2752) - 新增在途的历史审批,同步 ES 2024-10-09 18:25:04 +08:00
yangqicheng
2c049dde41 REQ-2752-Controller添加注解 2024-10-09 17:41:54 +08:00
yangqicheng
f546f2cd86 REQ-2752-接口入参添加注解 2024-10-09 17:30:20 +08:00
6cf2df0638 feat(REQ-2752) - 调整同步代码的逻辑 2024-10-09 17:00:40 +08:00
yangqicheng
065ea48fcd REQ-2752-添加注解 2024-10-09 16:45:09 +08:00
f38c866031 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 14:36:58 +08:00
2c6613b473 feat(REQ-2752) - 添加 FeignApi 2024-10-09 14:36:45 +08:00
031939bf07 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 14:21:15 +08:00
edb8d781f2 feat(REQ-2752) - 还原 XXL 配置 2024-10-09 14:21:04 +08:00
250d4d015d Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 13:50:42 +08:00
9e2ebd0c6f feat(REQ-2752) - 提供 XXL 入口,手动操作索引 2024-10-09 13:50:26 +08:00
5f589bd28d feat(REQ-2752) - 优化导入 2024-10-09 11:31:22 +08:00
261a1758f0 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 11:22:44 +08:00
139c77c322 feat(REQ-2752) - 调整启动类扫描路径 2024-10-09 11:13:00 +08:00
0ab3822607 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEngineApplication.java
2024-10-09 09:58:47 +08:00
f9e187682b update(REQ-2752) - 修改脚本文件内容 2024-10-09 09:56:01 +08:00
ba3e681776 Merge branch 'feature/REQ-2752-wl' into feature/REQ-2752
# Conflicts:
#	workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java
2024-10-09 09:46:45 +08:00
wangli
8a41820af4 feat(REQ-2752) - 增加 ES 搜索数据的条件,并测试多条件组合查询 2024-10-08 23:07:22 +08:00