Commit Graph

2745 Commits

Author SHA1 Message Date
d43a071f89 Merge branch 'feature/REQ-4624' into dev 2025-08-07 15:51:11 +08:00
aeda3ef08b feat(REQ-4624) - 处理数字组件的值 2025-08-07 15:50:53 +08:00
a27fbc4696 Merge branch 'feature/REQ-4624' into dev 2025-08-07 15:20:57 +08:00
e9d835084f feat(REQ-4624) - 新增表单数据数据查询接口 2025-08-07 15:20:44 +08:00
78c9a9b04f Merge branch 'feature/REQ-4624' into dev
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/FormAdminApi.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
2025-08-07 15:12:59 +08:00
8fd3641d41 feat(REQ-4624) - 新增表单数据数据查询接口 2025-08-07 15:11:45 +08:00
b16ee3cba6 feat(REQ-4624) - 同步的撤销审批可能出现乐观锁异常 2025-08-07 15:02:28 +08:00
9fda02747f feat(REQ-4624) - 兼容 test、pre 环境的一些问题 2025-08-07 11:34:34 +08:00
8673273039 feat(REQ-4624) - 兼容 test、pre 环境的一些问题 2025-08-07 10:55:52 +08:00
wangli
b42ed0b38c Merge branch 'hotfix/timer_alter' into feature/REQ-4624 2025-08-06 18:04:40 +08:00
wangli
c2eb8fde54 feat(REQ-4624) - 调整告警代码 2025-08-06 18:04:26 +08:00
wangli
33ed38f2f9 feat(REQ-4624) - 调整节点告警配置 2025-08-06 17:28:07 +08:00
wangli
bb0d93cfce Merge remote-tracking branch 'origin/master' into feature/REQ-4624
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/FormAdminApi.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
2025-08-06 17:14:17 +08:00
wangli
0bc2782c83 Merge remote-tracking branch 'origin/master' into feature/REQ-4586 2025-08-06 10:27:08 +08:00
wangli
b939780106 Merge branch 'feature/REQ-4624' into dev
# Conflicts:
#	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
2025-08-05 16:14:59 +08:00
wangli
b4422c34f0 feat(REQ-4624) - 调整表单数据转换为 wps 变量的逻辑 2025-08-05 16:14:35 +08:00
wangli
fe86607764 Merge branch 'feature/REQ-4624' into dev 2025-08-05 11:25:47 +08:00
wangli
f916a1b5e1 feat(REQ-4624) - 调整金额组件底层存储转换模型 2025-08-05 11:25:26 +08:00
wangli
6b0cd3befd Merge branch 'feature/REQ-4624' into dev 2025-08-05 10:37:30 +08:00
wangli
adb2c9a46d feat(REQ-4624) - 调整金额组件底层存储转换模型 2025-08-05 10:37:20 +08:00
wangli
572997a49d Merge branch 'feature/REQ-4624' into dev 2025-08-05 09:45:23 +08:00
wangli
be8eb0a619 feat(REQ-4624) - 调整通讯录组件底层存储转换模型 2025-08-05 09:45:11 +08:00
wangli
1e77d6da33 Merge branch 'feature/REQ-4624' into dev 2025-08-04 20:39:25 +08:00
wangli
8e287b3f24 feat(REQ-4624) - 添加获取表单实例数据的逻辑 2025-08-04 20:39:16 +08:00
wangli
9f04654d00 feat(REQ-4624) - 添加获取表单实例数据的逻辑 2025-08-04 16:28:36 +08:00
wangli
4610efa3f9 Merge branch 'feature/REQ-4624' into dev 2025-08-04 16:28:07 +08:00
wangli
f21d2282d4 feat(REQ-4624) - 添加获取表单实例数据的逻辑 2025-08-04 16:27:56 +08:00
6fdb3f99ff feat(REQ-4624) - 增加表单数据响应模型 2025-08-04 14:20:02 +08:00
8eb48df1e5 Merge branch 'feature/REQ-4624' into dev 2025-08-04 10:13:06 +08:00
99b7609d14 Merge branch 'hotfix/timer_alter' into feature/REQ-4624 2025-08-01 11:42:38 +08:00
1831d01da4 feat(timer_alter) - 调整告警逻辑的逻辑,尝试看能否避免 FK ,deadlock 的异常问题 2025-08-01 11:40:36 +08:00
380a8b0d5b Merge branch 'feature/REQ-4624' into dev 2025-07-31 10:42:24 +08:00
7b15b686fc Merge remote-tracking branch 'origin/master-bak' 2025-07-31 10:26:25 +08:00
3a8e82d203 Merge branch '1.5.2-SNAPSHOT' 2025-07-31 10:21:59 +08:00
ca4091d9ac Merge remote-tracking branch 'origin/dev-bak' into dev 2025-07-30 18:25:46 +08:00
07cecf2962 Merge branch '1.5.2-SNAPSHOT' into dev 2025-07-30 18:21:40 +08:00
5cd980e4d1 feat(REQ-4624) - 针对 BpmnTaskDelegateAssigner 模型增加 personId 的判断转换函数,避免业务出现问题 2025-07-30 18:13:59 +08:00
06fb598e5c feat(REQ-4624) - 针对 BpmnTaskDelegateAssigner 模型增加 personId 的判断转换函数,避免业务出现问题 2025-07-30 17:59:05 +08:00
fe1e9a245f Merge branch 'feature/REQ-4586' into dev 2025-07-30 17:17:29 +08:00
7016f26683 feat(REQ-4624) - 针对 BpmnTaskDelegateAssigner 模型增加 personId 的判断转换函数,避免业务出现问题 2025-07-30 17:17:03 +08:00
f8d66181ea feat(REQ-4624) - 针对 BpmnTaskDelegateAssigner 模型增加 personId 的判断转换函数,避免业务出现问题 2025-07-30 17:16:27 +08:00
159ba5d6ad Merge branch 'feature/REQ-4586' into dev 2025-07-30 16:35:56 +08:00
4ebda69a05 feat(REQ-4624) - 兼容一些表单默认内容的处理 2025-07-30 16:35:26 +08:00
7c5c21fbbd feat(REQ-4624) - 兼容一些表单默认内容的处理 2025-07-30 16:34:36 +08:00
c9bc7d2cb2 Merge branch 'feature/REQ-4624' into dev
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/FormAdminApi.java
2025-07-30 11:22:48 +08:00
86f7f2ba0b feat(REQ-4624) - 1.调整表单相关 API 的使用权限 2.新增直接查询表单数据的API 2025-07-29 15:32:53 +08:00
b3e3652082 feat(REQ-4624) - 调整审批业务分类的查询入参模型 2025-07-29 11:51:57 +08:00
8d26d4e300 Merge branch 'feature/REQ-4624' into dev 2025-07-29 11:42:06 +08:00
65b2369b2b feat(REQ-4624) - 调整审批业务分类的查询入参模型 2025-07-29 11:41:52 +08:00
wangli
25b7c72948 Merge branch 'feature/REQ-4586' into dev 2025-07-17 14:38:17 +08:00