Commit Graph

1708 Commits

Author SHA1 Message Date
43fc084016 Merge branch 'feature/REQ-5965' into dev 2025-12-03 10:42:37 +08:00
6b83bc655b feat(REQ-5965) - 调整待办发送时的变量获取方式 2025-12-03 10:42:16 +08:00
7b93802e7b Merge branch 'feature/REQ-5965' into dev 2025-12-03 10:13:04 +08:00
783d441a8d feat(REQ-5965) - 调整待办发送时的变量获取方式 2025-12-03 10:12:03 +08:00
09cae5c96e Merge branch 'feature/REQ-5865' into dev 2025-11-28 15:45:59 +08:00
fbe3bfd836 feat(REQ-5865) - 测试 trigger 问题 2025-11-28 15:41:55 +08:00
c980ddfc45 Merge branch 'feature/REQ-5865' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java
2025-11-28 15:15:05 +08:00
d452465750 feat(REQ-5865) - 测试 trigger 问题 2025-11-28 15:12:26 +08:00
415b18f5f1 feat(REQ-5865) - 测试 trigger 问题 2025-11-28 14:42:43 +08:00
a603654dcc feat(REQ-5865) - 细化日志内容 2025-11-28 11:56:37 +08:00
wangli
4ec43e1f9c feat(REQ-5865) - 测试 trigger 问题 2025-11-28 11:10:41 +08:00
5197a49637 feat(REQ-5865) - 测试 trigger 问题 2025-11-27 18:52:14 +08:00
b68a6bec15 feat(REQ-5865) - 测试 trigger 问题 2025-11-27 18:49:54 +08:00
0d77c05b53 feat(REQ-5865) - 测试 trigger 问题 2025-11-27 18:13:07 +08:00
952fe67590 feat(REQ-5865) - 测试 trigger 问题 2025-11-27 16:41:49 +08:00
ccda358a99 feat(REQ-5965) - 测试异步触发的处理 2025-11-27 15:06:34 +08:00
6c51985a03 Merge branch 'feature/REQ-6570' into dev 2025-11-26 14:49:26 +08:00
8716ea808f feat(REQ-6570) - 调整八大按钮操作逻辑中的附件处理逻辑,增加 fileKey 存储 2025-11-26 14:49:01 +08:00
84e2e890de fix - 调整转交时的任务判断 2025-11-25 14:46:21 +08:00
0f24168d32 Merge branch 'feature/RDMP-3845' into dev 2025-11-25 10:29:17 +08:00
141151acc3 feat(RDMP-3845) - 调整复选框消费时的多值链接符 2025-11-25 10:27:12 +08:00
65b8d9f9c4 Merge branch 'feature/RDMP-3845' into dev 2025-11-24 11:53:34 +08:00
b8c0405795 feat(RDMP-3845) - 调整单选复选框没有设置 options 导致的问题 2025-11-24 11:51:09 +08:00
7f08a971c6 Merge branch 'feature/REQ-5965' into dev 2025-11-21 17:25:15 +08:00
333de1e1af feat(RDMP-3845) - 调整 MQ 广播事件中的流程变量输出,过滤一些对业务无关紧要的数据 2025-11-21 16:00:53 +08:00
0ceacfb3bd Merge branch 'feature/REQ-5965' into dev 2025-11-21 13:34:43 +08:00
c9acc9cad8 feat(RDMP-3845) - 调整 MQ 广播事件中的流程变量输出,过滤一些对业务无关紧要的数据 2025-11-21 13:34:17 +08:00
f6847ad087 Merge branch 'feature/REQ-5965' into dev 2025-11-21 11:00:09 +08:00
4694ed6280 feat(RDMP-3845) - 调整 MQ 广播事件中的流程变量输出,过滤一些对业务无关紧要的数据 2025-11-21 10:59:35 +08:00
f1d93a4d0f feat(RDMP-3845) - 调整 MQ 广播事件中的流程变量输出,过滤一些对业务无关紧要的数据 2025-11-21 10:58:28 +08:00
d9ecc6ce35 Merge branch 'feature/RDMP-3845' into dev 2025-11-20 17:00:49 +08:00
e6d260a05b feat(RDMP-3845) - wps 文档变量替换逻辑完善,支持单选复选 2025-11-20 17:00:02 +08:00
2785433054 Merge branch 'feature/REQ-5865' into dev 2025-11-20 15:53:12 +08:00
a9a90ab46d feat(REQ-5865) - 调整审批日志接口入参,控制是否增加查询未来节点 2025-11-20 15:52:17 +08:00
d9c1b037d0 Merge branch 'feature/RDMP-3845' into dev 2025-11-20 11:04:04 +08:00
ce0630f831 feat(RDMP-3845) - 新增单选、复选的代码逻辑 2025-11-20 11:03:41 +08:00
464e94f368 feat(RDMP-3845) - 新增单选、复选的代码逻辑 2025-11-19 19:52:50 +08:00
d274905609 Merge branch 'feature/REQ-5965' into dev 2025-11-13 15:51:50 +08:00
6a23d85806 feat(REQ-5965) - 调整接口内部逻辑 2025-11-13 15:49:58 +08:00
34d0ff8ffc Merge branch 'feature/REQ-5965' into dev 2025-11-10 16:47:26 +08:00
f4f97fdbf3 feat(REQ-5965) - 解决查询流程文档 api 内部进支持运行时的情况 2025-11-10 16:46:16 +08:00
f117062124 Merge branch 'feature/REQ-5965' into dev 2025-11-07 17:24:01 +08:00
956c7d1314 feat(REQ-5965) - 调整在待办中查看附件的顺序 2025-11-07 17:22:49 +08:00
86f9d925c8 Merge branch 'hotfix/20251107_mq_header_error' into feature/REQ-5965 2025-11-07 16:17:21 +08:00
956b470786 fix - 调整处理 engine 事件的 context 并发问题 2025-11-07 16:16:18 +08:00
8722e5baea feat(REQ-5965) - 调整同意功能的日志数据存储 2025-11-07 15:53:27 +08:00
48feb8f46c Merge branch 'feature/REQ-5965' into dev 2025-11-06 18:36:57 +08:00
ccf56781fc feat(REQ-5965) - 移除同意操作时的空值变量 2025-11-06 18:33:23 +08:00
3a755e0d90 feat(REQ-5965) - 解决 ibatis 注解不能正常响应 json 字段的问题 2025-11-06 18:32:43 +08:00
b72909449b feat(REQ-5965) - 防御性编程,兼容 NPE 2025-11-06 18:31:42 +08:00
2e64ce2063 Merge branch 'feature/REQ-5965' into dev 2025-11-06 11:52:33 +08:00
3988c3bb60 feat(REQ-5965) - 调整因组织不存在设置的节点日志隐藏 2025-11-06 11:52:11 +08:00
8838fca027 Merge branch 'feature/REQ-5965' into dev 2025-11-05 17:06:32 +08:00
98ec67641f feat(REQ-5965) - 调整查询条件的逻辑 2025-11-05 17:06:15 +08:00
0602f69140 Merge remote-tracking branch 'origin/feature/REQ-5965' into dev 2025-11-05 10:31:03 +08:00
1800d98711 feat(REQ-5965) - 调整包含业务自定义文档后的内部已读逻辑 2025-11-05 10:30:35 +08:00
3e79c7d9fd Merge branch 'feature/REQ-5965' into dev 2025-11-04 09:52:27 +08:00
496eef6b5c feat(REQ-5965) - 调整第二版日志打印接口的逻辑,优化网址的传入 2025-11-04 09:34:52 +08:00
33897ac687 feat(REQ-5965) - 处理节点隐藏逻辑 2025-11-03 10:45:09 +08:00
a662e6fab7 feat(REQ-5965) - 新增创建审批流日志的 PDF 的异步任务 2025-10-31 17:41:45 +08:00
7f235042fa Merge branch 'feature/REQ-5965' into dev 2025-10-30 14:59:49 +08:00
388de9eb52 feat(REQ-5965) - 新增审批日志打印的数据接口 2025-10-30 14:57:40 +08:00
cdbe89c05a feat(REQ-5965) - 调整 BPMN 协议,增加条件字段权限配置信息 2025-10-29 18:31:43 +08:00
1f54f82c34 feat(REQ-5965) - 新增获取流程节点下的条件字段权限配置信息 2025-10-29 18:30:43 +08:00
57e698061f Merge branch 'feature/REQ-5250' into dev 2025-10-24 18:36:47 +08:00
2fa4680bac feat(REQ-5250) - 修复 checkInstanceApprover 函数onlyPersonId 的异常 2025-10-24 18:36:21 +08:00
bb57f7eb92 feat - 解决流程引擎框架中的 NPE 2025-10-24 17:49:47 +08:00
wangli
8d97f6ffc3 fix - 调整工作流的入参,支持完整控制顺序 2025-10-24 16:12:55 +08:00
50ae5ed25b feat - 新增更新流程实例变量的接口 2025-10-24 13:47:26 +08:00
0a8a58d71f Merge branch 'master' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
2025-10-23 14:46:37 +08:00
c7bff3bf34 Merge remote-tracking branch 'origin/master' into feature/countersign_ext
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
2025-10-23 09:56:09 +08:00
8d554d8b48 Merge remote-tracking branch 'origin/feature/starter_add_doc_event' into release-20251022 2025-10-22 13:49:45 +08:00
ffb9e023c8 feat - 移除 Flowable 配置中重复的 JobHandler 2025-10-22 11:11:20 +08:00
f1eb549ade Merge remote-tracking branch 'origin/hotfix/node-alter' into release-20251022 2025-10-22 11:09:26 +08:00
a7e28e6914 Merge branch 'feature/countersign_ext' into dev
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
2025-10-22 10:12:19 +08:00
5298b5f320 feat - 修复测试仅业务自定义文档是发现的一些问题 2025-10-22 10:09:38 +08:00
8b1fc0e108 Merge branch 'feature/countersign_ext' into dev 2025-10-21 11:51:34 +08:00
ba95e4850f feat - 新增创建流程实例时,支持业务传入自定义文档 2025-10-21 10:51:48 +08:00
67a760d083 Merge branch 'feature/countersign_ext' into dev 2025-10-20 19:44:13 +08:00
c6c62f2f85 feat - 同意的动作,增加修改或新增流程变量的逻辑 2025-10-20 19:31:41 +08:00
ba439c5706 Merge branch 'feature/countersign_ext' into dev 2025-10-20 16:54:38 +08:00
edaeb9101c feat - 审批人同意时,添加操作日期和审批结果 2025-10-20 16:29:42 +08:00
0bf8a65f6f Merge branch 'feature/countersign_ext' into dev 2025-10-20 15:41:46 +08:00
a37fc25db5 feat - 修改加签逻辑中的节点名称处理生成异常的问题 2025-10-20 15:41:22 +08:00
a1e65b73f6 Merge branch 'feature/countersign_ext' into dev 2025-10-20 14:39:49 +08:00
a422f44c69 feat - 修改后加签实现逻辑,采用前加签相同原理实现 2025-10-20 14:39:25 +08:00
7479f983f2 feat - 调整加签次数记录变量名 2025-10-20 13:48:02 +08:00
c8daa07437 Merge branch 'feature/countersign_ext' into dev 2025-10-20 13:39:36 +08:00
ad1efc673a feat - 加签实现调整新节点的 ID 生成逻辑 2025-10-20 13:38:44 +08:00
64cb5b5098 Merge branch 'feature/countersign_ext' into dev 2025-10-20 11:23:02 +08:00
7ac49ca863 feat - 解决编译问题 2025-10-20 11:22:38 +08:00
d44367db5a feat - 移除旧的告警节点 2025-10-20 11:19:19 +08:00
74af59508d Merge branch 'feature/countersign_ext' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
2025-10-20 11:16:54 +08:00
1e4d9e2ea9 feat - 项目启动完成后,提供 web 服务前,恢复动态加签逻辑 2025-10-20 11:15:41 +08:00
4d1193d333 feat - 新增一张加签记录表,用于 JVM 实例重启后的动态模型重载 2025-10-17 18:39:14 +08:00
565e6d320d feat - 测试前加签代码逻辑 2025-10-17 16:26:22 +08:00
770b5bc9d3 Merge branch 'feature/countersign_ext' into dev 2025-10-17 13:41:01 +08:00
c8238ba1ba feat - 增加前加签代码逻辑 2025-10-15 20:46:11 +08:00
015bcd8f53 Merge branch 'feature/countersign_ext' into dev 2025-10-15 11:10:57 +08:00
5187af00cd feat - 增加后加签的代码,待测试 2025-10-14 20:03:59 +08:00