Commit Graph

1658 Commits

Author SHA1 Message Date
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
047c035d38 Merge branch 'refs/heads/feature/countersign_ext' into dev 2025-10-14 17:40:22 +08:00
0a1be99b3e feat(REQ-5965) - 添加前加签代码逻辑,自测流程引擎内部是否正常 2025-10-11 18:06:12 +08:00
e555b06a85 Merge branch 'feature/countersign_ext' into dev 2025-10-10 15:28:39 +08:00
f461d17d2c feat(REQ-5965) - 添加前加签代码逻辑,自测流程引擎内部是否正常 2025-10-10 15:27:19 +08:00
678e19c3a6 feat(REQ-5965) - 前后加签功能文案调整 2025-10-10 15:00:36 +08:00
87a3fb93a1 Merge remote-tracking branch 'origin/master' into hotfix/node-alter 2025-10-10 14:28:10 +08:00
d3ca61723e Merge remote-tracking branch 'origin/master' into feature/REQ-4418_Enum
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java
2025-10-10 14:24:07 +08:00
19df0b5816 Merge remote-tracking branch 'origin/master' into feature/starter_add_doc_event 2025-10-10 10:07:54 +08:00
fb790b724f feat - 新增前后加签的分支 2025-09-29 14:21:41 +08:00
e1e6b038c7 Merge branch 'feature/starter_add_doc_event' into dev 2025-09-29 11:38:52 +08:00
bd596e8fb1 feat - Starter 增加 DocChange 事件 2025-09-29 11:35:34 +08:00
1352028fa5 Merge branch 'feature/REQ-4100' into dev 2025-09-18 15:00:00 +08:00
b17582842d feat(REQ-4100) - 支撑业务节点操作回退 2025-09-18 14:58:38 +08:00
3306f961ba Merge branch 'hotfix/activty_trigger_error' into dev 2025-09-17 11:54:31 +08:00
03148df3d3 fix - 修改业务节点触发异常的问题 2025-09-17 11:54:00 +08:00
7d6e64f337 fix - 老版本告警实现多余的动作 2025-09-09 11:24:00 +08:00
7c60c3c179 fix - 添加节点告警逻辑 2025-09-08 11:28:48 +08:00
1294f4d096 Merge branch 'hotfix/node-alter' into dev 2025-09-08 10:37:56 +08:00
74b462d1fc Merge remote-tracking branch 'origin/feature/REQ-4418_Enum' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java
2025-09-08 10:37:24 +08:00
wangli
f566fb0009 fix - 调整设置因数据字段修改为不能为空后引起的异常 2025-09-06 11:31:06 +08:00
wangli
7e5a140ed4 fix - 调整设置审批人的校验 2025-09-06 11:20:09 +08:00
972557b32c fix - 添加节点告警逻辑 2025-09-05 17:51:37 +08:00
ffbf270948 fix - 增加一张新表来支撑业务节点告警问题 2025-09-05 17:22:12 +08:00
f4168959e7 fix - 增加一张新表来支撑业务节点告警问题 2025-09-05 17:10:23 +08:00
70086f0b87 Merge remote-tracking branch 'origin/feature/REQ-4418'
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
2025-09-03 13:43:11 +08:00
344bdfd2ee feat(REQ-4418) - 调整钉钉发送逻辑,增加@的实现 2025-09-02 20:25:43 +08:00
ac6337db9e feat(REQ-4418) - 调整钉钉发送逻辑,增加@的实现 2025-09-02 20:17:17 +08:00
9f72c409a7 feat(REQ-4418) - 增加可忽略的告警应用 2025-09-02 17:46:32 +08:00
89a005469c Merge branch 'feature/REQ-4418' into feature/REQ-4418_Enum
# Conflicts:
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java
2025-09-02 09:41:38 +08:00
0f743afe99 feat(REQ-4418) - 新增流程批量查询接口 2025-09-01 16:27:52 +08:00
f73b1cfcda feat(REQ-4418) - 调整枚举 name 名,异常被修改 2025-09-01 15:32:23 +08:00
d4ca0dc538 feat(REQ-4418) - 调整新版配置中的最后操作人获取的问题 2025-08-29 15:15:05 +08:00
d36a53b7fe feat(REQ-4418) - 调整新版配置中的最后操作人获取的问题 2025-08-29 13:59:56 +08:00
9dfde7cf88 feat(REQ-4418) - 调整转交时的校验逻辑 2025-08-29 09:49:40 +08:00
c387eee91b feat(REQ-4418) - 处理枚举类 2025-08-28 17:33:53 +08:00
d03fd9cc17 feat(REQ-4418) - 兼容老版本的审批人指定 2025-08-28 16:14:50 +08:00
ffb288ca83 feat(REQ-4418) - 调整 JSON 转 BPMN 协议内容 2025-08-28 11:34:08 +08:00
10e3032af4 feat(REQ-4418) - 处理转交时的审批人 nodeId 校验问题 2025-08-27 17:54:11 +08:00
38f3ba685b feat(REQ-4418) - 调整发起人主管的二级范围限定 2025-08-26 18:19:07 +08:00
7043046844 feat(REQ-4418) - 优化一些提示文案 2025-08-26 14:49:43 +08:00
04035295b4 feat(REQ-4418) - 优化业务节点最顶部配置的冲突问题 2025-08-26 14:44:29 +08:00
4fafdf650c feat(REQ-4418) - 调整处理设置审批人的 nodeId 逻辑 2025-08-26 11:25:16 +08:00
88936feb50 feat(REQ-4418) - 处理上节点审批人的逻辑 2025-08-25 18:27:48 +08:00
7e08c6a233 feat(REQ-4418) - 处理上节点审批人的逻辑 2025-08-25 17:58:14 +08:00
75fccfd704 feat(REQ-4418) - 添加推测未来节点日志时的抄送节点配置内容 2025-08-25 17:22:07 +08:00
1f0fe80711 feat(REQ-4418) - 添加推测未来节点日志时的抄送节点配置内容 2025-08-25 17:22:01 +08:00
d84b055d46 feat(REQ-4418) - 添加推测未来节点日志时的抄送节点配置内容 2025-08-25 17:00:37 +08:00
65a9aead8f feat(REQ-4418) - 添加推测未来节点日志时的抄送节点配置内容 2025-08-25 16:55:35 +08:00
f08459c0a9 feat(REQ-4418) - 添加推测未来节点日志时的抄送节点配置内容 2025-08-25 16:46:34 +08:00
267e5faf3a feat(REQ-4418) - 添加推测未来节点日志时的抄送节点配置内容 2025-08-25 16:27:28 +08:00