|
|
8084fd62ff
|
Merge branch 'feature/RDMP-3845' into dev
# Conflicts:
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
|
2026-01-05 14:49:36 +08:00 |
|
|
|
8557ceccb8
|
Merge remote-tracking branch 'origin/master' into feature/RDMP-3845
# Conflicts:
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
|
2026-01-05 14:40:36 +08:00 |
|
|
|
f45dea2fec
|
Merge branch 'feature/REQ-5965' into dev
# Conflicts:
# workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
|
2025-12-25 16:30:19 +08:00 |
|
|
|
b486ed4927
|
feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑，配合审批业务中的替换为空的配置使用
|
2025-12-25 16:28:02 +08:00 |
|
|
|
2e4cb9b998
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-25 14:24:17 +08:00 |
|
|
|
1841d86b18
|
feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑，配合审批业务中的替换为空的配置使用
|
2025-12-25 14:23:26 +08:00 |
|
|
|
7455485c02
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-25 11:10:43 +08:00 |
|
|
|
39ed649aa0
|
feat(REQ-5965) - 调整因为开放了更新业务变量后，导致最新 wps 变量替换不准确的问题
|
2025-12-25 11:09:29 +08:00 |
|
|
|
115266e361
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-24 18:16:42 +08:00 |
|
|
|
f7234e9c11
|
feat(REQ-5965) - 调整审批业务变量未覆盖的问题
|
2025-12-24 18:16:19 +08:00 |
|
|
|
5197de3cf9
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-23 11:03:28 +08:00 |
|
|
|
678048bf4a
|
feat(REQ-5965) - 更新变量
|
2025-12-23 10:51:17 +08:00 |
|
|
|
d3f845c49b
|
feat(REQ-5965) - 调整条件设置的类型
|
2025-12-23 10:37:20 +08:00 |
|
|
|
66d348e67e
|
feat(REQ-5965) - 获取条件设置的值
|
2025-12-22 17:30:53 +08:00 |
|
|
|
006932a9e5
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-22 14:23:02 +08:00 |
|
|
|
ecdd054c12
|
feat(REQ-5965) - 调整处理条件变量字段的逻辑
|
2025-12-22 14:21:15 +08:00 |
|
|
|
a1cb68cafa
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-22 11:09:10 +08:00 |
|
|
|
94b9a0848c
|
feat(REQ-5965) - 兼容历史的存储模式
|
2025-12-22 11:08:40 +08:00 |
|
|
|
24db7ff862
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-22 10:40:52 +08:00 |
|
|
|
34d4cdea1e
|
feat(REQ-5965) - 调整单选复现条件的存储模式
|
2025-12-22 10:40:06 +08:00 |
|
|
|
a7dc35862a
|
Merge remote-tracking branch 'origin/master' into feature/REQ-5965
# Conflicts:
# workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
|
2025-12-22 10:17:24 +08:00 |
|
|
|
f9ab24fcea
|
Merge remote-tracking branch 'origin/feature/REQ-5965' into feature/REQ-5965
# Conflicts:
# workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/WpsUtil.java
|
2025-12-22 10:00:14 +08:00 |
|
wangli
|
b85c2ac097
|
feat(REQ-5965) - 调整同意审批时记录审批人信息时 NPE 的异常
|
2025-12-20 10:48:44 +08:00 |
|
wangli
|
b94ca42ca0
|
feat(REQ-5965) - 优化审批同意时，记录操作人信息
|
2025-12-19 23:41:18 +08:00 |
|
wangli
|
88b9e8e148
|
feat(REQ-5965) - 增加日志打印
|
2025-12-19 23:16:43 +08:00 |
|
|
|
5e0204cd73
|
feat(REQ-5965) - 新增wps 替换变量时，需要对无内存变量修改为空串
|
2025-12-19 18:10:43 +08:00 |
|
wangli
|
e3e30f9d71
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-19 11:23:41 +08:00 |
|
wangli
|
16bcecb62b
|
feat(REQ-5965) - 调整“查看文档”按钮无法正确打开业务传入的文档
|
2025-12-19 11:23:22 +08:00 |
|
|
|
9429126cd8
|
Merge branch 'feature/RDMP-3845' into dev
|
2025-12-18 10:23:54 +08:00 |
|
|
|
98f560dc77
|
feat(REQ-3845) - 调整获取流程模型表单定义内容
|
2025-12-18 10:23:25 +08:00 |
|
|
|
da8b379058
|
Merge branch 'hotfix/async_cancel' into dev
|
2025-12-11 09:49:21 +08:00 |
|
|
|
e6cb590f6a
|
fix - 异步撤回功能修复
|
2025-12-10 19:53:07 +08:00 |
|
|
|
6d597ca377
|
Merge branch 'feature/REQ-5865'
|
2025-12-10 11:21:04 +08:00 |
|
|
|
a6df8008a0
|
Merge branch 'feature/REQ-5250'
|
2025-12-10 11:20:52 +08:00 |
|
|
|
ab895b15de
|
Merge branch 'master' into feature/REQ-5250
|
2025-12-10 11:18:54 +08:00 |
|
|
|
5b625bbd83
|
Merge branch 'master' into feature/REQ-5865
|
2025-12-10 11:17:19 +08:00 |
|
|
|
a49f9bad15
|
feat(REQ-5865) - 解决 triggerAsync 后，业务节点文案消失的问题
|
2025-12-08 10:20:01 +08:00 |
|
|
|
9a0945fac1
|
feat(REQ-5865) - 解决 triggerAsync 后，业务节点文案消失的问题
|
2025-12-04 17:25:30 +08:00 |
|
|
|
65540e1685
|
feat(REQ-5865) - 添加执行过程日志
|
2025-12-04 17:25:28 +08:00 |
|
|
|
eeadc34060
|
Merge branch 'feature/RDMP-3845' into dev
|
2025-12-03 14:51:48 +08:00 |
|
|
|
b8d5fb8778
|
Merge branch 'feature/REQ-5965' into dev
|
2025-12-03 14:51:36 +08:00 |
|
|
|
e264b5b59b
|
feat(REQ-5965) - 调整单选条件的表达式设置
|
2025-12-03 14:50:58 +08:00 |
|
|
|
279d066b3b
|
feat(REQ-5965) - 调整待办发送时的变量获取方式
|
2025-12-03 14:19:03 +08:00 |
|
|
|
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 |
|
