Commit Graph

796 Commits

Author SHA1 Message Date
aabf4db951 Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 18:10:45 +08:00
42f11e17f3 feat(REQ-2924) - 修复查询出来的审批人,需要先补全头像信息,但数据不合规导致异常的问题 2024-10-11 18:09:59 +08:00
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
2dad84d1b1 feat(REQ-2924) - 调整一些逻辑 2024-10-11 17:18:20 +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
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
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
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
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
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
dff61a6068 feat(REQ-2752) - 实现 ES 中的搜索 2024-10-08 18:51:05 +08:00
yangqicheng
aaa00ee566 REQ-2752-添加管理员操作相关接口 2024-10-08 11:37:51 +08:00
d79435fed7 feat(REQ-2752) - 还原 XXL 配置 2024-10-08 10:43:11 +08:00
wangli
e88267b883 feat(REQ-2752) - 添加操作ES 的 API 2024-10-07 21:16:43 +08:00
wangli
a9d39e3ec5 feat(REQ-2752) - 通过 Entity 相关事件,处理在途的审批同步数据至 ES 2024-10-06 22:12:57 +08:00
ff6e991c34 feat(REQ-2752) - 1.调整已结束实例同步 ES 的代码设计. 2.增加记录初始同步时的操作时间. 3.增加新表用于记录操作时除开已完成的实例以外的数据(该功能可能会废弃). 2024-09-30 17:57:33 +08:00
6a38f65b3c feat(REQ-2752) - 增加任务同步 ES 的逻辑,并优化索引字段 2024-09-29 19:03:10 +08:00
yangqicheng
42792af2ff REQ-2924-调整流程管理员操作接口 2024-09-29 18:28:43 +08:00
7b81228bdb feat(REQ-2924) - 调用超管接口增加开关控制 2024-09-29 17:13:36 +08:00
96b34b88eb feat(REQ-2752) - 完善同步任务纬度数据到 ES 的逻辑 2024-09-29 17:02:14 +08:00
25b0bb16df feat(REQ-2924) - 调佣二方接口增加传入实例 ID 2024-09-29 16:30:22 +08:00
b2a4c6b57b feat(REQ-2752) - 增加同步纬度数据至 ES 的逻辑 2024-09-29 16:27:36 +08:00
wangli
8daa649642 feat(REQ-2752) - 添加 xxl-job 的日志路径配置 2024-09-29 00:22:54 +08:00
wangli
8bd8effa36 feat(REQ-2752) - 测试 ES 写入 2024-09-29 00:22:12 +08:00
wangli
5d73ad9972 fix(REQ-2752) - 解决项目启动问题 2024-09-28 16:20:59 +08:00
ea173c092b Merge remote-tracking branch 'origin/feature/REQ-2752' into feature/REQ-2752 2024-09-27 18:49:27 +08:00