Commit Graph

559 Commits

Author SHA1 Message Date
20b1c6f9fd feat(REQ-3769) - 调整连续业务节点的完成逻辑 2025-03-26 18:18:39 +08:00
1bae391156 feat(REQ-3769) - 添加签署确认节点的二级选人规则 2025-03-26 15:17:02 +08:00
ea4471e25d Merge remote-tracking branch 'origin/master' into feature/REQ-3769 2025-03-26 11:27:41 +08:00
17500aef65 feat(REQ-3769) - 完善代码相关注释 2025-03-26 11:21:50 +08:00
ccd3ef7203 feat(REQ-3769) - 调整发起时加载模板节点列表的逻辑,增加返回模板原始配置 2025-03-26 10:37:43 +08:00
1fbb8b6231 feat(REQ-3769) - 模板协议内容增加签署配置,以及反解析 bpmn 中的该配置 2025-03-25 18:09:13 +08:00
08107d59b3 feat(REQ-3824) - 调整判断节点长时间卡住的逻辑 2025-03-19 18:31:48 +08:00
9fba408bdd feat(REQ-3824) - 调整判断节点长时间卡住的逻辑 2025-03-19 16:47:40 +08:00
79150dedf7 Merge remote-tracking branch 'origin/master' into feature/REQ-3581 2025-03-14 15:15:22 +08:00
yangqicheng
ee224bd159 Merge branch 'refs/heads/feature/REQ-3626'
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
2025-03-10 15:45:37 +08:00
b4d438a71b feat(REQ-3581) - 增加一个超管的撤回,取消验证租户 ID 2025-03-03 11:19:46 +08:00
89f18f7632 feat(REQ-3581) - 增加一个超管的撤回,取消验证租户 ID 2025-03-03 10:54:46 +08:00
48ef611717 feat(REQ-3581) - 增加一个超管的撤回,取消验证租户 ID 2025-03-03 10:49:05 +08:00
yangqicheng
492180901c REQ-3626 驳回到指定节点支持指定任务进行处理 2025-02-24 16:38:58 +08:00
yangqicheng
477eb38925 REQ-3626 业务节点支持传附件 2025-02-24 15:58:54 +08:00
yangqicheng
0c77f34dfb REQ-3626 增加回退至指定节点通用能力 2025-02-23 23:02:28 +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
e1c1ec215f feat(REQ-3340) - 优化任务 reject 时,由于实现内部采用了虚拟任务,所以需跳过该任务的完成事件,它不应该广播出去 2025-02-19 18:09:49 +08:00
131f789ab0 feat(REQ-3340) - 优化一些异常提示语 2025-02-18 17:20:41 +08:00
1a0508b9ff feat(REQ-3340) - 优化一些异常提示语 2025-02-18 17:17:47 +08:00
dd057e089b feat(REQ-3340) - 保留同意操作时的签名数据 2025-02-14 13:54:35 +08:00
54a956fe08 feat(REQ-3340) - 保留同意操作时的签名数据 2025-02-13 19:07:16 +08:00
475759a9cc feat(REQ-3340) - 调整打印字段模型定义 2025-02-11 16:42:02 +08:00
f09917d114 feat(REQ-3340) - 调整打印模板的响应模型以及查询逻辑 2025-02-11 10:50:46 +08:00
de55ff9ee8 feat(REQ-3340) - 调整发起人自选的逻辑 2025-02-10 15:35:12 +08:00
31fe7e3f8f feat(REQ-3340) - 调整注释 2025-02-08 17:03:36 +08:00
d096ed9350 feat(REQ-3340) - 新增覆盖更新指定流程中最后一次的表单中指定的表单项数据 2025-02-08 13:38:34 +08:00
a5cd0761f7 feat(REQ-3340) - 添加通过表单引擎创建审批时的附件传入模型 2025-02-05 14:53:48 +08:00
0612f5c46e feat(REQ-3340) - 增加审批日志查询时,返回是否包含打印模板 2025-01-25 22:46:28 +08:00
3a15814ff3 feat(REQ-3340) - 处理表单的自定义组件,从保存,到回显的逻辑 2025-01-24 16:16:39 +08:00
568bb07e31 feat(REQ-3340) - 处理表单多种业务组件的保存和回显逻辑 2025-01-22 18:36:18 +08:00
4d39265ecd feat(REQ-3340) - starter 更新 API 如果存在相同方法名同异步的处理办法 2025-01-22 10:39: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
2de6ea0c1f feat(REQ-3340) - 调整审批模板响应的模型字段,增加模板名称,文件名称,模板配置内容 2025-01-20 16:15:39 +08:00
767dc77c19 feat(REQ-3340) - 调整结束审批实例的最后操作人放入广播中的事件 2025-01-20 15:27:42 +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
a5ad2194ee feat(REQ-3340) - 1.新增打印开关控制 2. 增加打印模板中字段的定义 2025-01-17 19:04:13 +08:00
yangqicheng
45b5e84ef4 REQ-3502 抄送节点设置执行动作为NONE 2025-01-17 18:23:43 +08:00
yangqicheng
62d218ddf1 REQ-3502 修复驳回,返回任务状态错误问题 2025-01-16 11:37:19 +08:00
b4d3cc1ec9 feat(REQ-3340) - 实现电子签名记录关联节点,并控制自动过审时校验非开启电子签名节点 2025-01-16 11:35:38 +08:00
yangqicheng
34ce379a54 REQ-3502 调整设置任务状态代码 2025-01-16 10:19:04 +08:00
yangqicheng
da8b4640f6 REQ-3502 修复撤回设置停留节点key错误问题 2025-01-15 18:10:36 +08:00
81e962891b feat(REQ-3340) - 1. 增加基于发起人自选的模板节点集合;2. 增加打印开关控制; 3. 增加电子签名开关配置 2025-01-15 17:24:09 +08:00
yangqicheng
29565cc758 REQ-3502 流程撤回设置发起人状态 2025-01-15 17:14:32 +08:00
yangqicheng
e172daf771 REQ-3502 按钮查询添加发起人执行状态 2025-01-15 09:31:20 +08:00
33f136ec82 feat(REQ-3340) - 增加打印开关状态控制的接口 2025-01-14 18:56:26 +08:00
yangqicheng
500a084a22 REQ-3502 调整设置隐藏自定按钮代码 2025-01-14 16:22:58 +08:00
yangqicheng
f7d8c83536 REQ-3502 调整根据任务获取按钮代码 2025-01-13 19:58:07 +08:00
yangqicheng
455d43f75d REQ-3502 添加根据审批任务,流程实例id查询任务状态,按钮接口 2025-01-13 17:23:53 +08:00
yangqicheng
c276a0fca3 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-3023 2024-12-19 09:52:10 +08:00
yangqicheng
9769489e8e Merge branch 'refs/heads/master' into feature/REQ-3383
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomAbortProcessInstanceCmd.java
2024-12-18 15:46:07 +08:00
yangqicheng
0516396ea5 REQ-3383-中止添加advice字段 2024-12-18 11:02:04 +08:00
yangqicheng
c03cfd87c5 REQ-3023-触发业务节点增加activityId参数,避免连续业务节点触发,导致请求被验重切面拦截问题 2024-12-13 13:57:49 +08:00
8131aa4614 feat(REQ-3383) - 调整 API 模型注释 2024-12-10 18:02:00 +08:00
12853fbb6b feat(REQ-3383) - 调整 API 模型注释 2024-12-10 17:58:38 +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
a26557305c feat(REQ-3383) - 优化机器人节点完成时,可能导致数据一致的问题 2024-12-09 14:38:26 +08:00
7b6b92242a feat(REQ-3383) - 完善 API 模型的入参校验 2024-12-09 13:42:20 +08:00
46597dc64b feat(REQ-3004) - 完善 API 模型中的注释 2024-12-09 11:46:42 +08:00
67b521f41b feat(REQ-3383) - 配合调整机器人节点的携带附件,并重写构造器 2024-12-09 11:21:56 +08:00
f5ecf5a3f0 feat(REQ-3383) - 调整中止接口入参模型,并处理机器人问题展示问题 2024-12-06 18:31:40 +08:00
4da28246e9 feat(REQ-3383) - 调整中止接口入参模型 2024-12-05 18:51:23 +08:00
e1d064676b feat(REQ-3004) - 修复一些特殊配置引起的异常 2024-12-03 15:54:05 +08:00
407732f91e feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 10:54:52 +08:00
9bdbaca647 feat(REQ-3004) - 解决 key 与 category 的切换问题 2024-11-28 17:21:44 +08:00
bf3e4b8c2a feat(REQ-3004) - 解决审批模型多版本切换时,不能正常查询表单模型内容 2024-11-27 16:38:38 +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
a3d9dd437c feat(REQ-3004) - 添加同意动作携带表单内容的日志 2024-11-25 17:32:27 +08:00
62056d754e feat(REQ-3004) - 调整搜索实例数据的属性命名 2024-11-25 10:10:07 +08:00
475cd9a944 feat(REQ-3004) - 处理工程中现在有的 TODO 项 2024-11-22 16:51:46 +08:00
50db7c9e3f feat(REQ-3004) - 调整使用表单发起流程时,需要对附件类型做额外处理 2024-11-22 16:45:13 +08:00
a1c8327891 feat(REQ-3004) - 调整表单字段权限 2024-11-20 15:49:09 +08:00
b7211cb587 feat(REQ-3004) - JSON 模型转 BPMN 的协议内容增加前端回显字段 2024-11-20 10:43:16 +08:00
1111b0c6ec feat(REQ-3004) - 详细描述获取表单数据的 API 2024-11-19 17:50:34 +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
7edfd1e0a0 feat(REQ-3004) - 集成表单引擎测试 2024-11-13 10:44:20 +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
2cecfd6beb feat(REQ-3004) - 测试表单引擎 2024-11-07 18:53:18 +08:00
d11c420f39 feat(REQ-3004) - 测试表单引擎 2024-11-07 17:41:26 +08:00
99b773b49f feat(REQ-3004) - 测试表单引擎 2024-11-07 10:53:35 +08:00
890fd3542c feat(REQ-3004) - 添加 BPMN 协议中的表单字段权限 2024-11-07 09:43:37 +08:00
32a2ecdc6e feat(REQ-3004) - 添加 BPMN 协议中的表单字段权限 2024-11-06 20:40:08 +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
77080cb083 fix - 调整 es 同步 2024-11-06 15:35:29 +08:00