Commit Graph

1228 Commits

Author SHA1 Message Date
bd5f578a71 feat(REQ-3340) - 调整查询是否有打印模板的逻辑 2025-02-24 16:57:47 +08:00
f2347a3dc4 feat(REQ-3340) - 优化表单数据更新的 API 说明 2025-02-24 13:55:01 +08:00
yangqicheng
8f41522a01 REQ-3626 修复报错问题 2025-02-23 23:05:42 +08:00
yangqicheng
0c77f34dfb REQ-3626 增加回退至指定节点通用能力 2025-02-23 23:02:28 +08:00
wangli
22edab6bf6 feat(REQ-3383) - 合并代码,解决冲突 2025-02-22 18:14:35 +08:00
wangli
e4a85dffd4 Merge branch 'master' into feature/REQ-3340
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessInstanceApi.java
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskWithFormCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/event/MessagePushEventBuilder.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessInstanceService.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
2025-02-22 18:04:57 +08:00
wangli
9961058c59 feat(REQ-3383) - 消息的模型增加节点电子签开关 2025-02-22 17:51:58 +08:00
1109b185bf feat(REQ-3340) - 优化重置打印模板相关参数 2025-02-20 15:51:43 +08:00
yangqicheng
50512ec8dd Merge remote-tracking branch 'refs/remotes/origin/hotfix/hotfix-transfer-admin-change' into feature/REQ-3502 2025-02-20 13:37:49 +08:00
yangqicheng
8b30f63cd3 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-3502 2025-02-20 13:36:40 +08:00
6e63aa50bd feat(REQ-3340) - 添加打印模板日志 2025-02-20 10:41:18 +08:00
fc8b1f3358 feat(REQ-3340) - 优化打印变量查询的逻辑 2025-02-19 20:06:03 +08:00
e1c1ec215f feat(REQ-3340) - 优化任务 reject 时,由于实现内部采用了虚拟任务,所以需跳过该任务的完成事件,它不应该广播出去 2025-02-19 18:09:49 +08:00
af44769263 feat(REQ-3340) - 优化审批同意时,如果未包含表单数据,则主动切换普通的同意 2025-02-19 17:29:26 +08:00
a6f64724e3 feat(REQ-3340) - 优化审批日志中的人的模型 2025-02-19 16:12:09 +08:00
wangli
4119aa9249 feat(REQ-3383) - 优化打印变量的处理逻辑 2025-02-15 12:51:07 +08:00
c6e775e365 feat(REQ-3340) - 调整获取打印模板的逻辑 2025-02-13 15:00:35 +08:00
fe95eb783a feat(REQ-3340) - 调整打印变量值的处理逻辑 2025-02-13 14:37:49 +08:00
df85c19673 feat(REQ-3340) - 调整打印变量的日期相关格式 2025-02-13 11:17:58 +08:00
475759a9cc feat(REQ-3340) - 调整打印字段模型定义 2025-02-11 16:42:02 +08:00
c4c03b7a6e feat(REQ-3340) - 调整打印字段响应的属性值 2025-02-11 15:32:48 +08:00
39057b4aae feat(REQ-3340) - 新增一些 API 2025-02-11 11:48:13 +08:00
9258f54c3f feat(REQ-3340) - 调整一些 API 的接口描述 2025-02-11 11:21:44 +08:00
f09917d114 feat(REQ-3340) - 调整打印模板的响应模型以及查询逻辑 2025-02-11 10:50:46 +08:00
a1a4e503bd feat(REQ-3340) - 调整一些代码 2025-02-10 11:06:57 +08:00
d096ed9350 feat(REQ-3340) - 新增覆盖更新指定流程中最后一次的表单中指定的表单项数据 2025-02-08 13:38:34 +08:00
cdb9fcd23f feat(REQ-3340) - 新增打印时的变量处理逻辑 2025-01-21 16:57:48 +08:00
c6c010f4f9 feat(REQ-3340) - 新增代运营重置打印模板配置内容的接口定义和实现 2025-01-20 20:08:38 +08:00
0b493e2d0e feat(REQ-3340) - 调整打印标题和模板内容的 API 定义 2025-01-20 18:03:22 +08:00
5ed2a410d2 feat(REQ-3340) - 1.增加保存更新打印模板内容;2.增加通过模型或实例 ID 查询打印模板内容 2025-01-20 17:15:03 +08:00
4b367b6233 feat(REQ-3340) - 调整结束审批实例的最后操作人放入广播中的事件 2025-01-20 15:18:07 +08:00
542f349ad3 feat(REQ-3340) - 转交和回退增加广播的 MQ 事件类型,仅实现转交,并增加返回被转交人的信息 2025-01-20 14:35:08 +08:00
yangqicheng
e8ebb27a1e hotfix 转交管理员查询老接口,参数添加流程实例id 2025-01-20 10:31:51 +08:00
a5ad2194ee feat(REQ-3340) - 1.新增打印开关控制 2. 增加打印模板中字段的定义 2025-01-17 19:04:13 +08:00
yangqicheng
5877776c6c REQ-3502 修复超送待办任务id为空问题 2025-01-16 17:45:19 +08:00
b4d3cc1ec9 feat(REQ-3340) - 实现电子签名记录关联节点,并控制自动过审时校验非开启电子签名节点 2025-01-16 11:35:38 +08:00
81e962891b feat(REQ-3340) - 1. 增加基于发起人自选的模板节点集合;2. 增加打印开关控制; 3. 增加电子签名开关配置 2025-01-15 17:24:09 +08:00
yangqicheng
ae6eab9ddc REQ-3502 调整获取任务按钮地址 2025-01-15 11:31:00 +08:00
33f136ec82 feat(REQ-3340) - 增加打印开关状态控制的接口 2025-01-14 18:56:26 +08:00
yangqicheng
455d43f75d REQ-3502 添加根据审批任务,流程实例id查询任务状态,按钮接口 2025-01-13 17:23:53 +08:00
ec713161e5 fix - 调整类型的包路径 2025-01-08 14:25:01 +08:00
金海洋
0e040762ad Merge branch 'feature/REQ-3282' into 'master'
Feature/req 3282

See merge request universal/infrastructure/backend/workflow-engine!16
2025-01-08 02:51:13 +00:00
yangqicheng
f15b6abb67 REQ-3282 调整代码结构 2024-12-26 16:38:35 +08:00
yangqicheng
b32e287fc9 REQ-3282 修复转交指定人错误问题 2024-12-26 16:07:51 +08:00
yangqicheng
45ef878ec2 REQ-3282 分页查询人员信息,设置起始页码为1 2024-12-25 18:39:19 +08:00
yangqicheng
17d55fc995 REQ-3282 调整人员查询接口逻辑 2024-12-25 18:26:32 +08:00
yangqicheng
96f9404d30 REQ-3828 调整代码结构 2024-12-25 16:50:27 +08:00
yangqicheng
b2b772a87e REQ-3288-调整代码 2024-12-24 17:28:50 +08:00
yangqicheng
44b3e2c399 REQ-3282-人员查询迁移到新接口 2024-12-23 16:08:17 +08:00
yangqicheng
c03cfd87c5 REQ-3023-触发业务节点增加activityId参数,避免连续业务节点触发,导致请求被验重切面拦截问题 2024-12-13 13:57:49 +08:00
e04d4995a8 Merge branch 'feature/REQ-3383' into feature/REQ-3004
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomAbortProcessInstanceCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCancelProcessInstanceCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCompleteDummyTaskCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
2024-12-10 11:31:10 +08:00
f5ecf5a3f0 feat(REQ-3383) - 调整中止接口入参模型,并处理机器人问题展示问题 2024-12-06 18:31:40 +08:00
e1d064676b feat(REQ-3004) - 修复一些特殊配置引起的异常 2024-12-03 15:54:05 +08:00
wangli
05599273f2 feat(REQ-3004) - 解决 webapi 无法正确响应异常信息 2024-12-02 22:30:10 +08:00
0fd8d78de9 feat(REQ-3004) - 调整表单管理 API 地址 2024-12-02 11:24:36 +08:00
bf3e4b8c2a feat(REQ-3004) - 解决审批模型多版本切换时,不能正常查询表单模型内容 2024-11-27 16:38:38 +08:00
753eb10c4c feat(REQ-3004) - 批量 ES 同步的逻辑中,精细化 tag 2024-11-27 11:09:23 +08:00
wangli
38f59b513c feat(REQ-3004) - 调整携带表单的同意动作的异步处理逻辑 2024-11-27 00:38:05 +08:00
wangli
18d02def93 feat(REQ-3004) - 调整 key 与 category 的变化 2024-11-27 00:31:12 +08:00
wangli
ee52753981 feat(REQ-3004) - 调整需要发送钉钉告警的判断 2024-11-27 00:14:59 +08:00
wangli
bbf79bc27e feat(REQ-3004) - 调整代运营的表单模型关联逻辑 2024-11-26 23:00:36 +08:00
98c1dc7cc8 feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 19:10:34 +08:00
4c9084613f feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 18:39:32 +08:00
2a6aeef32e Merge remote-tracking branch 'origin/feature/REQ-3290' into feature/REQ-3004
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskCmd.java
2024-11-26 14:03:53 +08:00
bd9a8f22f5 feat(REQ-3004) - 完善 API 的日志 2024-11-26 13:43:28 +08:00
475cd9a944 feat(REQ-3004) - 处理工程中现在有的 TODO 项 2024-11-22 16:51:46 +08:00
e07850c5d9 feat(REQ-3004) - 调整应用 POM 依赖,移除无关的 jar,避免影响启动 2024-11-21 14:49:03 +08:00
5ce082a125 feat(REQ-3004) - 调整应用 POM 依赖,移除无关的 jar,避免影响启动 2024-11-21 13:56:38 +08:00
39099d3247 feat(REQ-3004) - 移除测试时的线程限制 2024-11-21 13:35:00 +08:00
67c021b8fe feat(REQ-3004) - 移除测试时的线程限制 2024-11-21 11:47:33 +08:00
88799743d9 feat(REQ-3004) - 移除测试时的线程限制 2024-11-21 11:45:58 +08:00
de8da186a9 feat(REQ-3004) - 优化 ES 同步的逻辑 2024-11-21 11:36:35 +08:00
cc879142d7 feat(REQ-3004) - 调整 ES 同步测试为批量模式 2024-11-21 10:31:07 +08:00
611c0351d1 feat(REQ-3004) - 调整日志报告的逻辑 2024-11-21 09:47:02 +08:00
fea19159db feat(REQ-3004) - 优化审批实例数据同步 ES 的逻辑 2024-11-21 09:26:03 +08:00
5b33ad1b5b feat(REQ-3004) - 调整 Riven 监听 2024-11-20 15:51:39 +08:00
805ae9ae72 feat(REQ-3004) - 节点表单字段权限的模型增加 FieldName 属性,用于前端回显 2024-11-19 16:57:52 +08:00
yangqicheng
c2bfb0bbfa REQ-3290-V2.1.1审批流优化,批量转交处理优化 2024-11-19 14:28:58 +08:00
161ad7b574 feat(REQ-3004) - 集成表单引擎,测试使用 2024-11-18 19:47:07 +08:00
afacb6aa98 feat(REQ-3004) - 集成表单引擎,测试使用 2024-11-18 17:20:46 +08:00
1677058381 feat(REQ-3004) - 处理表单字段默认值的变量解析 2024-11-15 18:29:14 +08:00
b74c3d79cd feat(REQ-3004) - 集成表单引擎 2024-11-15 15:43:37 +08:00
d4e1b97a8a feat(REQ-3004) - 集成表单引擎测试 2024-11-14 18:43:32 +08:00
b9c63e2e82 feat(REQ-3004) - 集成表单引擎测试 2024-11-13 09:48:01 +08:00
db9c9bec31 feat(REQ-3004) - 集成表单引擎测试 2024-11-12 10:17:49 +08:00
d5ed0367d5 feat(REQ-3004) - 集成表单引擎测试 2024-11-11 13:59:25 +08:00
424da03bd2 feat(REQ-3004) - 集成表单引擎测试 2024-11-08 18:37:06 +08:00
2c0630f888 Merge branch 'hotfix/es-sync-fix' into feature/REQ-3004 2024-11-08 11:13:55 +08:00
6d4b857e10 fix - 调整监听配置 2024-11-08 10:04:15 +08:00
26bd236bb1 fix - 调整监听配置 2024-11-08 10:01:38 +08:00
60e7af03df fix - 移除一个 mq 监听 2024-11-08 09:48:36 +08:00
6786eca246 fix - 调整结构 2024-11-08 09:45:41 +08:00
2cecfd6beb feat(REQ-3004) - 测试表单引擎 2024-11-07 18:53:18 +08:00
bbe812d0bd feat(REQ-3004) - 测试表单引擎 2024-11-07 17:42:39 +08:00
d11c420f39 feat(REQ-3004) - 测试表单引擎 2024-11-07 17:41:26 +08:00
af5a881915 fix - 新版日志返回前,统一加载最新的头像 2024-11-07 10:03:11 +08:00
70d2dcbadd feat(REQ-3004) - 测试表单引擎 2024-11-06 18:12:42 +08:00
61f7b215cc fix - 调整 es 同步 2024-11-06 17:12:03 +08:00
1842d19560 fix - 调整 es 同步 2024-11-06 16:03:11 +08:00
2a3cac50c0 fix - 调整 es 同步 2024-11-06 15:36:03 +08:00
77080cb083 fix - 调整 es 同步 2024-11-06 15:35:29 +08:00
aec13a3f1b fix - 调整 es 同步 2024-11-06 14:31:05 +08:00
96140a7d13 fix - 调整 es 同步 2024-11-06 14:14:04 +08:00
a3c718fa4e feat(REQ-3004) - 测试表单引擎 2024-11-06 10:52:48 +08:00
2542cb9f87 fix - 调整记录客户端版本的处理 2024-11-06 09:36:46 +08:00
0837505242 fix - 调整 ES 同步功能 2024-11-06 09:24:43 +08:00
df6861fbb1 feat(REQ-3004) - 测试表单引擎 2024-11-05 18:25:42 +08:00
271e5b2b34 fix - 处理发起人 2024-11-05 14:58:09 +08:00
92f4038a56 update - 测试表单引擎 2024-11-05 14:47:12 +08:00
f198fa4184 fix - 修复引擎同步运行时数据的异常行为 2024-11-04 14:55:50 +08:00
629239e7dd feat(REQ-3004) - 调整项目结构 2024-11-04 14:11:33 +08:00
fe7b4e7e18 fix - 优化导入 2024-11-04 11:44:19 +08:00
771fc73ce7 fix - 调整运行时的实例同步 ES 的逻辑 2024-11-04 11:12:26 +08:00
fc21effdbe Merge remote-tracking branch 'origin/master' into feature/form_test
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/ShellUtil.java
2024-10-31 09:59:49 +08:00
4428f34be7 feat(REQ-3114) - 异常一些异常合并 2024-10-30 16:45:43 +08:00
a394c8a690 Merge remote-tracking branch 'origin/master' into feature/merge_2924_2752 2024-10-30 13:48:59 +08:00
e51a2836e8 feat(REQ-3114) - 配合 riven 进行 MQ 消息的监听处理 2024-10-28 15:57:57 +08:00
yangqicheng
b2d510c331 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-2924' into release-20241028
# Conflicts:
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java
2024-10-28 10:52:19 +08:00
521805c2ef feat(REQ-3115) - 配合Riven 的钉钉消息处理 2024-10-25 18:48:12 +08:00
5f72e96ee2 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-22 18:47:31 +08:00
ede722a6ed feat(2752) - 完善 Shell 工具的类描述 2024-10-22 18:46:38 +08:00
1bb69318b3 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-22 16:05:14 +08:00
7de7c7e47a feat - 添加执行 shell 命令的 web api 2024-10-22 16:05:00 +08:00
8a883076a3 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-22 15:51:27 +08:00
46ca23f81d feat - 添加执行 shell 命令的 web api 2024-10-22 15:51:08 +08:00
9069c732d0 feat - 添加执行 shell 命令的 web api 2024-10-22 15:49:30 +08:00
352a71f81a Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-22 13:49:04 +08:00
6b39e276f0 feat - 添加执行 shell 命令的 web api 2024-10-22 13:48:06 +08:00
ee87f42882 feat - 添加执行 shell 命令的 web api 2024-10-22 13:47:44 +08:00
9c82a709be feat(REQ-2752) - 优化导入 2024-10-21 17:46:48 +08:00
f31a3578c5 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 18:05:44 +08:00
06a9f3f6d3 feat(REQ-2752) - 调整运行时的审批,同步 ES 时先删除,再同步之间的代码 NPE 的问题 2024-10-18 18:05:33 +08:00
7f7a38fb2e Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 17:41:18 +08:00
ca9f63dbdf feat(REQ-2752) - 解决 NPE 2024-10-18 17:40:22 +08:00
4be268cfe5 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 16:43:12 +08:00
0ef090dca7 feat(REQ-2752) - 调整运行中的实例动作注册事务提交后执行的监听。 2024-10-18 16:42:53 +08:00
21ff034e83 optimize - 调整 starter 中的日志输出级别,减少不必要的日志打印 2024-10-18 14:32:32 +08:00
afe5d37b07 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 11:17:29 +08:00
0bd59ecb9a feat(REQ-2752) - 添加流程实例运行结束后,同步最终的状态至 ES 2024-10-18 11:17:11 +08:00
28d2495c41 feat - 测试一些表单相关功能 2024-10-17 17:09:39 +08:00
8dd4f2eb55 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 17:49:00 +08:00
49eb9377ec fix(REQ-2752) - 调整同步指定实例的数据 2024-10-16 17:48:48 +08:00
12b6681e46 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 17:17:23 +08:00
be5d00b55b fix(REQ-2752) - 解决编译问题 2024-10-16 17:16:16 +08:00
a32279acc4 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 17:10:12 +08:00
56741cabd2 feat(REQ-2752) - 调整运行时的数据同步 ES 的逻辑 2024-10-16 17:09:58 +08:00
6ad025c642 feat(REQ-2752) - 调整运行时的数据同步 ES 的逻辑 2024-10-16 16:53:12 +08:00
5fd13a534c Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 10:24:05 +08:00
1073820957 feat(REQ-2752) - 完善一些日志输出 2024-10-16 10:23:54 +08:00
wangli
3d0ee26f23 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 21:52:51 +08:00
wangli
7f3d00187e feat(REQ-2752) - 添加同步指定流程实例的任务 2024-10-15 21:52:34 +08:00
59b4259e8c Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 17:43:52 +08:00
4a171e17e7 feat(REQ-2752) - 处理兼容流程任务的审批人可能没人名的情况 2024-10-15 17:43:36 +08:00
0a5e939fce feat(REQ-2752) - 调整数据同步的分页大小 2024-10-15 17:01:14 +08:00
2218710e10 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-14 19:30:07 +08:00
ae83141701 feat(REQ-2752) - ES 数据同步增加流程实例的发起人信息 2024-10-14 18:17:07 +08:00
9980807a86 feat(REQ-2752) - 控制日志输出量 2024-10-14 15:42:17 +08:00
yangqicheng
f42da8ddfd REQ-2752-删除管理员接口,返回删除记录数量 2024-10-14 11:40:17 +08:00
yangqicheng
47cc2d4bd0 REQ-2752-新增根据条件删除流程管理员接口 2024-10-14 11:28:52 +08:00
wangli
98140825fe Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-12 22:59:22 +08:00
wangli
3318e09da2 feat(REQ-2752) - 增加任务维度的数据搜索 2024-10-12 22:58:15 +08:00
10d237bab1 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-12 18:58:25 +08:00
yangqicheng
ec39ba0ef0 REQ-2752-增加流程管理员数量查询逻辑 2024-10-12 18:50:08 +08:00
76a5d9ea3c Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 18:26:48 +08:00
2e289303a5 feat(REQ-2924) - 兼容处理 “null” 字符串的问题 2024-10-11 18:23:15 +08:00
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
d24e7fd2ae feat(REQ-2752) - 完善流程实例同步 ES 的文档模型 2024-09-27 18:49:17 +08:00
yangqicheng
bcce548998 REQ-2752-审批管理员相关功能接口实现 2024-09-27 18:03:43 +08:00
7d61d29d95 feat(REQ-2924) - 调整抄送时,处理的虚拟任务的问题 2024-09-26 15:59:15 +08:00
94851ce665 feat(REQ-2752) - 简单调整 module, 添加 ES 文档模型 2024-09-26 15:29:29 +08:00
3da94cced2 feat(REQ-2924) - 修复一些测试 BUG 2024-09-26 13:07:32 +08:00
40f4bb721a Merge branch 'feature/REQ-2924' into feature/REQ-2752
# Conflicts:
#	pom.xml
2024-09-25 18:22:19 +08:00
yangqicheng
fc81026ee8 REQ-2924-处理合并master分支代码冲突 2024-09-25 17:59:39 +08:00
yangqicheng
c036742415 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-2924
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessActivityApi.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessActivityService.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java
2024-09-25 17:49:37 +08:00
201c890ecf feat(REQ-2752) - 增加 es module 2024-09-25 17:09:15 +08:00
450fa726b4 feat(REQ-2924) - 增加查询超管异常的提示 2024-09-25 14:34:48 +08:00
f5a4479b57 feat(REQ-2924) - 优化调用二方接口的日志告警 2024-09-25 13:51:56 +08:00
8db08de5fe feat(REQ-2924) - 完善转交管理时的解析 outype 的 NPE 问题 2024-09-25 11:33:19 +08:00
1c5acfd728 feat(REQ-2924) - 完善离职的判断逻辑 2024-09-24 21:06:19 +08:00
c80f57a0fe feat(REQ-2924) - 完善离职的判断逻辑 2024-09-24 20:33:56 +08:00
3fcc1e5bbb feat(REQ-2924) - 完善发起人主管的找超管的入参 2024-09-24 17:52:17 +08:00
3af8822bba feat(REQ-2924) - 指定审批人,会调用二方接口查询人员是否在职 2024-09-24 17:02:15 +08:00
fb09025440 feat(REQ-2924) - 指定审批人,会调用二方接口查询人员是否在职 2024-09-24 16:55:26 +08:00
333abc1cb4 feat(REQ-2924) - 调整岗位、角色后,查询转交的超管后的逻辑优化 2024-09-24 14:04:01 +08:00
yangqicheng
27d1efaa34 REQ-2924-修改字段名 2024-09-23 17:29:17 +08:00
yangqicheng
3e37d35986 REQ-2924-任务事件消息增加评论内容 2024-09-23 17:26:59 +08:00
yangqicheng
4174e4f451 REQ-2924-修复task事件消息没有附件问题 2024-09-20 15:39:38 +08:00
yangqicheng
1cc46a40cf REQ-2924-去掉多余依赖 2024-09-19 18:58:22 +08:00
yangqicheng
e85cf6cde5 REQ-2924-修复NPE问题 2024-09-19 17:52:36 +08:00
yangqicheng
9ea952ca8d REQ-2924-修复查询人员报错问题 2024-09-19 17:23:12 +08:00
yangqicheng
fa66b6f4ec REQ-2924-调整角色,管理员查询api 2024-09-19 11:53:51 +08:00
yangqicheng
2b98fc5311 REQ-2924-修复自动审批节点审批任务计算错误问题 2024-09-18 15:38:46 +08:00
yangqicheng
09fae758a0 添加配置 2024-09-18 11:49:54 +08:00
yangqicheng
e235952257 REQ-2924-事件消息增加附件信息和businessKey 2024-09-18 11:18:57 +08:00
9ccfa13340 feat(REQ-2924) - 优化异常告警的内容 2024-09-14 15:23:50 +08:00
e221cb1d6b feat(REQ-2924) - 优化异常告警的内容 2024-09-14 14:56:40 +08:00
e9c189c589 feat(REQ-2924) - 恢复注释的代码 2024-09-14 14:17:04 +08:00
e7b26a1d04 feat(REQ-2924) - 新版日志表脚本添加索引 2024-09-14 14:16:16 +08:00
4ab77e7a4f feat(REQ-2924) - 解决回退的目标节点,有转交的情况下,日志展示不正常 2024-09-14 12:49:17 +08:00
yangqicheng
fc36c31bfd REQ-2924-退回节点查询接口去掉重复提交注解 2024-09-14 10:53:45 +08:00
41a9baebaf feat(REQ-2924) - 测试业务节点卡住的告警逻辑 2024-09-13 17:33:23 +08:00
yangqicheng
73275141b4 REQ-2924-钉钉构造堆栈信息异常,不再钉钉消息提示 2024-09-13 11:39:17 +08:00
wangli
0c7c70eb43 feat(REQ-2924) - 测试新版日志,完善日志中的人名和头像 2024-09-12 21:04:22 +08:00
yangqicheng
801b2f0f5a REQ-2924-调整钉钉提示查询堆栈信息地址 2024-09-12 19:10:51 +08:00
yangqicheng
e74cb7180c Merge remote-tracking branch 'origin/feature/REQ-2924' into feature/REQ-2924 2024-09-12 19:03:57 +08:00
yangqicheng
0ddbaad244 REQ-2924-调整钉钉提示查询堆栈信息地址 2024-09-12 19:03:19 +08:00
7c9e9f387e feat(REQ-2924) - 新版日志处理 2024-09-12 19:03:12 +08:00
yangqicheng
faa9409b4a REQ-2924-调整钉钉打印堆栈信息逻辑 2024-09-12 18:42:24 +08:00
yangqicheng
c2cb856bde REQ-2924-增加钉钉提醒异常堆栈信息打印 2024-09-12 18:12:06 +08:00
eb809a6157 feat(REQ-2924) - 新版日志处理 2024-09-12 17:42:24 +08:00
9f11bd21ab feat(REQ-2924) - 新版日志处理 2024-09-12 17:11:43 +08:00
3c36040c29 feat(REQ-2924) - 记录重试失败后的异常信息 2024-09-12 16:00:20 +08:00
f20ba76d49 feat(REQ-2924) - 调整所有 Assignee 的人名和头像,确保一定有值 2024-09-12 14:48:03 +08:00
638a8178e2 feat(REQ-2924) - 添加节点长时间卡住的告警逻辑 2024-09-11 14:00:32 +08:00
e082b9d0cc feat(REQ-2924) - 过滤 /error 2024-09-11 10:53:16 +08:00
3d213a9cab feat(REQ-2924) - 修改“退回”的文案 2024-09-10 16:00:04 +08:00
f221b53c3d feat(REQ-2924) - 完整测试单条分支路线各种节点的日志生成数据 2024-09-09 18:10:07 +08:00
7d6561cb9f feat(REQ-2924) - 调整 Activity Service 的实现,保持风格统一 2024-09-09 15:06:20 +08:00
wangli
89e33fb766 feat(REQ-2924) - 测试新版日志,并提供外部查询日志的聚合接口 2024-09-08 14:57:12 +08:00
wangli
f30d891f82 feat(REQ-2924) - 新增新版日志查询逻辑 2024-09-07 23:00:07 +08:00
yangqicheng
b6ab7db0ed REQ-2924-调整获取退回节点列表接口 2024-09-06 14:10:04 +08:00
yangqicheng
879e1a8caf REQ-2924-处理修改错误问题 2024-09-06 12:08:06 +08:00
yangqicheng
1dfa364282 REQ-2924-调整回退到指定节点逻辑 2024-09-05 11:53:59 +08:00
47f3861d7b feat(REQ-2616) - 移除引擎自动加载实例变量 2024-09-03 20:51:10 +08:00
280e8f0de2 feat(REQ-2616) - 完善Activity 节点的回调,以及定时触发功能逻辑 2024-09-03 18:35:53 +08:00
f2593e5330 feat(REQ-2616) - 完善Activity 节点的回调,以及定时触发功能逻辑 2024-09-03 17:20:32 +08:00
yangqicheng
19e75f3a65 REQ-2924-调整回退代码逻辑 2024-09-03 17:17:20 +08:00
yangqicheng
ae173d789b REQ-2924-增加回退到指定节点,回退节点选项接口 2024-09-03 16:47:30 +08:00
yangqicheng
d6aa18dea0 REQ-2924-调整回退到指定节点代码 2024-09-02 11:14:39 +08:00
yangqicheng
a4df310e54 REQ-2924-流程支持退回功能 2024-09-02 09:41:21 +08:00
f9573d06bf feat(REQ-2616) - 新增业务节点定时回调的事件 2024-08-20 17:52:50 +08:00
4a21d256dc feat(REQ-2616) - 新增业务接口定时触发流转的功能 2024-08-16 18:36:12 +08:00
a3b7b39068 update - 完善一些代码注释,并优化一些代码命名和执行逻辑 2024-08-09 17:28:15 +08:00
90a3c0cf71 fix - 完善自动驳回功能处理 2024-08-08 18:52:44 +08:00
37ed9a594d fix - 利用引擎 AsyncCmd 的能力解决通过监听事务状态不能正确发送 MQ 的问题 2024-08-08 18:08:20 +08:00
248ce361d1 fix - 利用引擎 AsyncCmd 的能力解决通过监听事务状态不能正确发送 MQ 的问题 2024-08-08 17:18:45 +08:00
f5b8f66a39 fix - 调整因为修复自动过审卡节点导致MQ 事件无法正确发出的问题 2024-08-08 16:27:15 +08:00
aba60920c8 fix - 调整因为修复自动过审卡节点导致MQ 事件无法正确发出的问题 2024-08-08 10:45:15 +08:00
1f78af48a9 fix - 在自动过审的逻辑中,通过注册事务完成后执行具体逻辑 2024-08-07 18:05:45 +08:00
yangqicheng
5c180f92a5 Merge branch 'refs/heads/feature/REQ-2596' into feature/merge-all 2024-07-29 10:39:11 +08:00
yangqicheng
00c7fa6812 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-2596' into feature/merge-all
# Conflicts:
#	pom.xml
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxProperty.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
2024-07-29 10:25:18 +08:00
yangqicheng
5b2fa9e0ed Merge remote-tracking branch 'refs/remotes/origin/feature/starter' into feature/merge-all 2024-07-29 10:18:46 +08:00
76ee6c0f92 update(REQ-2596) - review code 2024-07-25 17:38:30 +08:00
yangqicheng
4f12272526 REQ-2596-加签参数日志输出json格式 2024-07-24 11:33:36 +08:00
656b2c371b add - 新增日志打印 2024-07-22 21:12:22 +08:00
250dd40831 update - 增加数据库脚本升级逻辑控制 2024-07-16 09:58:25 +08:00
yangqicheng
9b55b354e6 REQ-2596-修复自动过审条件判断错误问题 2024-07-15 15:07:27 +08:00
yangqicheng
ada988a158 REQ-2596-业务节点设置为指定审批人,还未指定审批人时,不进行自动过审操作 2024-07-15 14:35:52 +08:00
yangqicheng
6ea8b4b95b REQ-2596-自动过审判断,上一节点如果是业务节点,但是是人员审批,也需要加入到自动过审 2024-07-15 13:54:27 +08:00
yangqicheng
a155b2422c REQ-2596-业务节点参与自动过审 2024-07-15 10:47:44 +08:00
yangqicheng
eee3f4f882 REQ-2516-调整分批次发送mq消息代码 2024-07-12 09:51:18 +08:00