Commit Graph

1482 Commits

Author SHA1 Message Date
9e67b346c9 feat(REQ-3824) - 调整签署确认节点的配置,与解析 2025-03-26 20:25:03 +08:00
6c1a0e41fa feat(REQ-3824) - 调整连续业务节点的完成逻辑 2025-03-26 18:20:41 +08:00
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
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
d191be09aa feat(REQ-3824) - 添加告警日志中的触发时间 2025-03-25 10:50:00 +08:00
4116978402 feat(REQ-3824) - 中止实例时,优先清除调该实例的定时任务 2025-03-21 10:50:46 +08:00
e887b560a9 feat(REQ-3824) - 调整中止实例的逻辑 2025-03-20 18:18:33 +08:00
d70705be65 feat(REQ-3824) - 调整中止实例的逻辑 2025-03-20 18:09:23 +08:00
008948c312 feat(REQ-3824) - 添加 API 地址 2025-03-20 16:51:10 +08:00
75f8f2448e feat(REQ-3824) - 添加 API 地址 2025-03-20 16:22:54 +08:00
4141fe6583 feat(REQ-3824) - 调整判断节点长时间卡住的逻辑 2025-03-19 20:44:57 +08:00
b114dab23c feat(REQ-3824) - 调整判断节点长时间卡住的逻辑 2025-03-19 20:27:12 +08:00
08107d59b3 feat(REQ-3824) - 调整判断节点长时间卡住的逻辑 2025-03-19 18:31:48 +08:00
197b129e57 feat(REQ-3824) - 优化代码 2025-03-19 17:05:33 +08:00
9fba408bdd feat(REQ-3824) - 调整判断节点长时间卡住的逻辑 2025-03-19 16:47:40 +08:00
d93c03e078 feat(REQ-3824) - 调整判断节点长时间卡住的逻辑 2025-03-19 14:25:59 +08:00
c67415ff73 feat(REQ-3824) - 完善日志 2025-03-19 14:16:02 +08:00
f6f456ff26 feat(REQ-3824) - 添加日志,进行测试 2025-03-19 10:21:34 +08:00
2470fbc167 feat(REQ-3824) - 调整业务节点设置审批人时,不参与业务节点告警 2025-03-14 18:28:00 +08:00
7c38f99fe9 Merge branch 'feature/REQ-3824' 2025-03-14 17:23:37 +08:00
53d78aa8d1 feat(REQ-3824) - 调整业务节点设置审批人时,不参与业务节点告警 2025-03-14 17:19:27 +08:00
2dd06d9563 Merge branch 'feature/REQ-3824' 2025-03-14 15:16:11 +08:00
79150dedf7 Merge remote-tracking branch 'origin/master' into feature/REQ-3581 2025-03-14 15:15:22 +08:00
b7f82afa73 feat(REQ-3824) - 调整字段注释含义 2025-03-14 13:37:41 +08:00
2e33b3aba8 feat(REQ-3824) - 业务节点长时间卡住告警 2025-03-14 11:36:43 +08:00
4c4b8bc6b7 feat(REQ-3581) - 精确化业务节点的发起人自选配置 2025-03-13 10:31:56 +08:00
ac4088b28d feat(REQ-3824) - 添加业务节点卡住的告警功能 2025-03-12 16:30:07 +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
58acda9127 feat(REQ-3581) - 增加一个超管的撤回,取消验证租户 ID 2025-03-03 11:30:22 +08:00
48ef611717 feat(REQ-3581) - 增加一个超管的撤回,取消验证租户 ID 2025-03-03 10:49:05 +08:00
64fb780150 feat(REQ-3340) - 调整查询是否有打印模板的逻辑 2025-02-24 17:47:10 +08:00
bd5f578a71 feat(REQ-3340) - 调整查询是否有打印模板的逻辑 2025-02-24 16:57:47 +08:00
yangqicheng
492180901c REQ-3626 驳回到指定节点支持指定任务进行处理 2025-02-24 16:38:58 +08:00
yangqicheng
29cc5bee10 REQ-3626 修复驳回到指定节点异常问题 2025-02-24 16:30:06 +08:00
yangqicheng
477eb38925 REQ-3626 业务节点支持传附件 2025-02-24 15:58:54 +08:00
yangqicheng
ab71c67889 REQ-3626 修复退回到指定节点报错问题 2025-02-24 14:57:02 +08:00
yangqicheng
1d4454731f REQ-3626 调整退回指定节点代码逻辑 2025-02-24 14:44:11 +08:00
f2347a3dc4 feat(REQ-3340) - 优化表单数据更新的 API 说明 2025-02-24 13:55:01 +08:00
yangqicheng
57ae8b7cfd REQ-3626 修复驳回到指定节点报错问题 2025-02-24 11:41:08 +08:00
yangqicheng
8f41522a01 REQ-3626 修复报错问题 2025-02-23 23:05:42 +08:00
yangqicheng
0c77f34dfb REQ-3626 增加回退至指定节点通用能力 2025-02-23 23:02:28 +08:00
wangli
22edab6bf6 feat(REQ-3383) - 合并代码,解决冲突 2025-02-22 18:14:35 +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
wangli
9a16872e37 feat(REQ-3383) - 优化创建表单模型的逻辑 2025-02-22 16:35:53 +08:00
62dffaa0bd feat(REQ-3340) - 优化重置打印模板相关参数 2025-02-21 16:54:18 +08:00
d65d6cb970 feat(REQ-3340) - 优化重置打印模板相关参数 2025-02-21 13:56:46 +08:00
yangqicheng
50512ec8dd Merge remote-tracking branch 'refs/remotes/origin/hotfix/hotfix-transfer-admin-change' into feature/REQ-3502 2025-02-20 13:37:49 +08:00
yangqicheng
8b30f63cd3 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-3502 2025-02-20 13:36:40 +08:00
e1c1ec215f feat(REQ-3340) - 优化任务 reject 时,由于实现内部采用了虚拟任务,所以需跳过该任务的完成事件,它不应该广播出去 2025-02-19 18:09:49 +08:00
4e772ed178 feat(REQ-3340) - 优化审批同意时,如果未包含表单数据,则主动切换普通的同意 2025-02-19 17:29:21 +08:00
05f4be0868 feat(REQ-3340) - 优化模型查询逻辑 2025-02-18 17:42:14 +08:00
1a0508b9ff feat(REQ-3340) - 优化一些异常提示语 2025-02-18 17:17:47 +08:00
3962ef82d0 feat(REQ-3340) - 调整查询模型的参数个数 2025-02-18 15:44:01 +08:00
2357d84fca feat(REQ-3340) - 调整查询模型的参数个数 2025-02-18 15:25:47 +08:00
wangli
6d9a5dd1e1 feat(REQ-3383) - 优化打印变量的处理逻辑 2025-02-15 18:10:26 +08:00
wangli
4119aa9249 feat(REQ-3383) - 优化打印变量的处理逻辑 2025-02-15 12:51:07 +08:00
54a956fe08 feat(REQ-3340) - 保留同意操作时的签名数据 2025-02-13 19:07:16 +08:00
4c515355fe feat(REQ-3340) - 调整获取打印模板的逻辑 2025-02-13 15:38:24 +08:00
c6e775e365 feat(REQ-3340) - 调整获取打印模板的逻辑 2025-02-13 15:00:35 +08:00
df85c19673 feat(REQ-3340) - 调整打印变量的日期相关格式 2025-02-13 11:17:58 +08:00
3dbbce42a6 feat(REQ-3340) - 配合前端调整业务组件的处理逻辑 2025-02-12 14:35:34 +08:00
ffcf89a905 feat(REQ-3340) - 调整模型列表不能正确返回所有模型的打印配置数据 2025-02-12 14:34:37 +08:00
e5a92af9ec feat(REQ-3340) - 优化解析表单实例数据的逻辑 2025-02-11 17:13:49 +08:00
a96a72ad70 feat(REQ-3340) - 优化查询是否能打印的逻辑 2025-02-11 16:19:01 +08:00
f634341326 feat(REQ-3340) - 调整模型的值定义 2025-02-11 14:59:55 +08:00
39057b4aae feat(REQ-3340) - 新增一些 API 2025-02-11 11:48:13 +08:00
f09917d114 feat(REQ-3340) - 调整打印模板的响应模型以及查询逻辑 2025-02-11 10:50:46 +08:00
bccd9f105a feat(REQ-3340) - 调整查询打印模板的逻辑 2025-02-10 20:55:51 +08:00
8a6de44b17 feat(REQ-3340) - 调整审批模板元数据处理逻辑 2025-02-10 16:18:37 +08:00
ef528310c0 feat(REQ-3340) - 调整审批模板元数据处理逻辑 2025-02-10 16:13:10 +08:00
de55ff9ee8 feat(REQ-3340) - 调整发起人自选的逻辑 2025-02-10 15:35:12 +08:00
ef29a95dfd feat(REQ-3340) - 移除一些无用逻辑 2025-02-10 09:56:34 +08:00
d096ed9350 feat(REQ-3340) - 新增覆盖更新指定流程中最后一次的表单中指定的表单项数据 2025-02-08 13:38:34 +08:00
75d7fb302a feat(REQ-3340) - 移除一些无用代码 2025-02-05 14:41:31 +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
yangqicheng
a2a710d7f7 hotfix 修复空指针问题 2025-01-21 17:21:35 +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
5766a74de2 feat(REQ-3340) - 1.增加保存更新打印模板内容;2.增加通过模型或实例 ID 查询打印模板内容 2025-01-20 17:16:16 +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
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
5877776c6c REQ-3502 修复超送待办任务id为空问题 2025-01-16 17:45:19 +08:00
yangqicheng
83f542a1ab REQ-3502 调整代码生成FeignClient的name值为workflow-engine 2025-01-16 14:20:14 +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
7519807de4 feat(REQ-3340) - 增加打印开关状态控制的接口 2025-01-14 18:56:29 +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
9ecea80004 REQ-3502 计算按钮判断流程状态 2025-01-14 11:03:34 +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
ec713161e5 fix - 调整类型的包路径 2025-01-08 14:25:01 +08:00
金海洋
0e040762ad Merge branch 'feature/REQ-3282' into 'master'
Feature/req 3282

See merge request universal/infrastructure/backend/workflow-engine!16
2025-01-08 02:51:13 +00:00
yangqicheng
b32e287fc9 REQ-3282 修复转交指定人错误问题 2024-12-26 16:07:51 +08:00
yangqicheng
84924e578d REQ-3828 修复启动流程变量未设置问题 2024-12-25 17:36:46 +08:00
yangqicheng
96f9404d30 REQ-3828 调整代码结构 2024-12-25 16:50:27 +08:00
yangqicheng
de0776889e Merge remote-tracking branch 'refs/remotes/origin/hotfix/20241224' into feature/REQ-3023 2024-12-25 10:02:17 +08:00
yangqicheng
22af047c02 hotfix/20241224-修复PersonId为空,转换long报错问题 2024-12-24 16:56:03 +08:00
yangqicheng
6f613b4af5 REQ-3023-修复连续业务节点日志显示错误问题 2024-12-23 11:11:17 +08:00
yangqicheng
820c3cee08 REQ-3023-修复连续业务节点,多个流程并发处理,产生死锁问题 2024-12-23 01:07:01 +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
23e65ca58a REQ-3383-处理代码合并冲突 2024-12-18 15:48:20 +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
04f883be8a REQ-3383-调整中止流程添加意见代码 2024-12-18 11:06:44 +08:00
yangqicheng
0516396ea5 REQ-3383-中止添加advice字段 2024-12-18 11:02:04 +08:00
yangqicheng
5c2c27414d REQ-3023-修复查询表单数据报错问题 2024-12-13 16:51:21 +08:00
yangqicheng
c03cfd87c5 REQ-3023-触发业务节点增加activityId参数,避免连续业务节点触发,导致请求被验重切面拦截问题 2024-12-13 13:57:49 +08:00
727e485e17 feat(REQ-3023) - 解决不同的两个相邻业务节点无法正确推动流程 2024-12-12 17:30:50 +08:00
abc7884d26 feat(REQ-3383) - 调整创建的索引排序 2024-12-10 16:29:33 +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
cc1c6d9920 feat(REQ-3383) - 优化机器人节点完成时,可能导致数据一致的问题 2024-12-10 11:23:20 +08:00
a26557305c feat(REQ-3383) - 优化机器人节点完成时,可能导致数据一致的问题 2024-12-09 14:38:26 +08:00
5a40a0b98c feat(REQ-3004) - 调整业务节点告警 2024-12-09 11:37:21 +08:00
67b521f41b feat(REQ-3383) - 配合调整机器人节点的携带附件,并重写构造器 2024-12-09 11:21:56 +08:00
e9ae50ecba feat(REQ-3383) - 重命名函数 2024-12-09 10:35:15 +08:00
5d376d2ac5 Merge remote-tracking branch 'origin/master' into feature/REQ-3383
# Conflicts:
#	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/BpmnProcessInstanceServiceImpl.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
2024-12-09 09:52:11 +08:00
wangli
07885fe65b feat(REQ-3383) - 日志中存在机器人节点时,日志展示不完整 2024-12-07 01:00:26 +08:00
91c223165c feat(REQ-3383) - 日志中存在机器人节点时,日志展示不完整 2024-12-06 20:40:57 +08:00
aa5972e804 feat(REQ-3383) - 日志中存在机器人节点时,日志展示不完整 2024-12-06 19:48:56 +08:00
f717e3c09d feat(REQ-3383) - 日志中存在机器人节点时,日志展示不完整 2024-12-06 18:43:37 +08:00
f5ecf5a3f0 feat(REQ-3383) - 调整中止接口入参模型,并处理机器人问题展示问题 2024-12-06 18:31:40 +08:00
212ed6f94f feat(REQ-3004) - 调整发送异常的 md 组装逻辑 2024-12-04 10:40:38 +08:00
e1d064676b feat(REQ-3004) - 修复一些特殊配置引起的异常 2024-12-03 15:54:05 +08:00
e483d76a3a feat(REQ-3004) - 修复一些特殊配置引起的异常 2024-12-03 15:00:11 +08:00
ef80fa98a1 feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 12:30:45 +08:00
e0fbfcf039 feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 11:10:43 +08:00
407732f91e feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 10:54:52 +08:00
90901af1f6 feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 10:31:20 +08:00
6ee1a562e7 feat(REQ-3004) - 调整表单提交时,将字段值清空后的回显逻辑 2024-12-03 09:56:21 +08:00
wangli
05599273f2 feat(REQ-3004) - 解决 webapi 无法正确响应异常信息 2024-12-02 22:30:10 +08:00
8c1ee10c0e feat(REQ-3004) - 调整模型的 category 2024-12-02 20:13:45 +08:00
f4207ca658 feat(REQ-3004) - 调整模型的 category 2024-12-02 19:47:54 +08:00
acc0e7db19 feat(REQ-3004) - 调整表单值“”为需要设置默认值。为 null 时,代表字段别人工修改为空 2024-12-02 17:24:31 +08:00
e980167afc feat(REQ-3004) - 调整创建新的模型(代运营)时,模型判断逻辑 2024-12-02 16:51:49 +08:00
73273f0e80 feat(REQ-3004) - 调整创建新的模型(代运营)时,模型判断逻辑 2024-12-02 16:50:53 +08:00
e42bd7e5ec feat(REQ-3004) - 调整创建新的模型(代运营)时,模型判断逻辑 2024-12-02 16:34:18 +08:00
af66a1292b feat(REQ-3004) - 调整表单默认值数据处理的逻辑 2024-11-29 17:52:58 +08:00
e1e2403af8 feat(REQ-3004) - 调整表单默认值数据处理的逻辑 2024-11-29 17:36:24 +08:00
9368e7808a feat(REQ-3004) - 调整表单默认值数据处理的逻辑 2024-11-29 17:24:26 +08:00
43b5e8ff56 feat(REQ-3004) - 提炼表单模型处理逻辑,含处理数据 2024-11-29 16:10:44 +08:00
9bdbaca647 feat(REQ-3004) - 解决 key 与 category 的切换问题 2024-11-28 17:21:44 +08:00
d98bcd5b66 feat(REQ-3004) - 解决 key 与 category 的切换问题 2024-11-28 16:10:41 +08:00
797d2a9409 feat(REQ-3004) - 解决表单默认值返回时,剔除空字符串 2024-11-28 15:59:42 +08:00
9de032d17a feat(REQ-3004) - 解决 key 与 category 调整引起的问题 2024-11-28 15:58:41 +08:00
bcc3420917 feat(REQ-3004) - 调整返回 key 的问题 2024-11-28 15:51:17 +08:00
3b33a87d63 feat(REQ-3004) - 处理发起时表单内容 2024-11-28 15:15:03 +08:00
5f2cd081d7 feat(REQ-3004) - 添加一些用于以后扩展的注释 2024-11-28 10:02:06 +08:00
5a0075edbd feat(REQ-3004) - 调优“审批数据”查询功能 2024-11-28 09:23:35 +08:00
33e4ef8f63 feat(REQ-3004) - 调优“审批数据”查询功能 2024-11-27 20:52:58 +08:00
bf3e4b8c2a feat(REQ-3004) - 解决审批模型多版本切换时,不能正常查询表单模型内容 2024-11-27 16:38:38 +08:00
yangqicheng
4f636c4b6a Merge branch 'refs/heads/feature/REQ-2595' into release/20241127 2024-11-27 15:02:28 +08:00
bb409d45de fix - 解决合并代码的冲突 2024-11-27 11:37:10 +08:00
8d032521b6 Merge remote-tracking branch 'origin/master' into feature/REQ-3004
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCommandContext.java
2024-11-27 11:35:26 +08:00
9930f782ca fix - 关于一些批量操作,对数据库的外键约束异常信息进行过滤 2024-11-27 11:34:30 +08:00
4e1bc80359 feat(REQ-3004) - 调整审批业务的 category 与 key 的问题 2024-11-27 10:30:47 +08:00
wangli
71798d9cd0 feat(REQ-3004) - 调整创建携带表单的实例逻辑 2024-11-27 01:32:56 +08:00
wangli
43fccac41c feat(REQ-3004) - 调整携带表单的同意动作的异步处理逻辑 2024-11-27 01:14:18 +08:00
wangli
38f59b513c feat(REQ-3004) - 调整携带表单的同意动作的异步处理逻辑 2024-11-27 00:38:05 +08:00
wangli
18d02def93 feat(REQ-3004) - 调整 key 与 category 的变化 2024-11-27 00:31:12 +08:00
wangli
cc04e5fcdb feat(REQ-3004) - 调整创建流程实例的参数 2024-11-27 00:04:52 +08:00
wangli
bbf79bc27e feat(REQ-3004) - 调整代运营的表单模型关联逻辑 2024-11-26 23:00:36 +08:00
98c1dc7cc8 feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 19:10:34 +08:00
4c9084613f feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 18:39:32 +08:00
421898131d feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 17:35:57 +08:00
bb0fb418b3 feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 17:14:42 +08:00
55e6b86eea feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 16:54:26 +08:00
b250d0ee8d feat(REQ-3004) - 完善表索引 2024-11-26 15:16:31 +08:00
7476728287 feat(REQ-3004) - 合并多个需求,解决编译问题 2024-11-26 14:04:45 +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
cb57c28c00 Merge remote-tracking branch 'origin/feature/REQ-2595' into feature/REQ-3004 2024-11-26 14:01:44 +08:00
e0a82705c5 feat(REQ-3004) - 完善相关注释和日志打印 2024-11-26 10:17:46 +08:00
9bc8dbae71 feat(REQ-3004) - 调整获取表单实例的数据逻辑 2024-11-25 20:24:55 +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
6a99b1180c feat(REQ-3004) - 调整是否发送钉钉消息的控制 2024-11-21 15:51:46 +08:00
611c0351d1 feat(REQ-3004) - 调整日志报告的逻辑 2024-11-21 09:47:02 +08:00
yangqicheng
2e940e2c7a REQ-3290-转交任务不能转交给自己当前任务 2024-11-21 09:41:14 +08:00
fea19159db feat(REQ-3004) - 优化审批实例数据同步 ES 的逻辑 2024-11-21 09:26:03 +08:00
yangqicheng
00784efff6 REQ-2595-修复加签异常问题 2024-11-20 21:29:44 +08:00
yangqicheng
cd8b82dd51 REQ-2595-调整加签逻辑 2024-11-20 21:15:28 +08:00
yangqicheng
786d160cd7 REQ-2595-调整加签逻辑 2024-11-20 21:12:57 +08:00
yangqicheng
39918d0a77 REQ-2595-调整代码逻辑 2024-11-20 20:29:03 +08:00
yangqicheng
f9cf430c75 REQ-3290-转交去掉任务重复校验 2024-11-20 19:48:12 +08:00
yangqicheng
22862fe24f REQ-3290-调整加签逻辑,被加签人已存在,产生多余任务后,结束待办 2024-11-20 16:16:12 +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
yangqicheng
f924196b15 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-2595 2024-11-18 17:54:35 +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
yangqicheng
815d69aaae REQ-2595-修复批量转交错误未提示问题 2024-11-10 22:33:22 +08:00
yangqicheng
c46d61480e REQ-2595-修复批量终止错误信息未提示问题 2024-11-09 19:45:35 +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
70d2dcbadd feat(REQ-3004) - 测试表单引擎 2024-11-06 18:12:42 +08:00
0033427234 fix - 调整 es 同步 2024-11-06 11:01:32 +08:00
df6861fbb1 feat(REQ-3004) - 测试表单引擎 2024-11-05 18:25:42 +08:00
92f4038a56 update - 测试表单引擎 2024-11-05 14:47:12 +08:00
629239e7dd feat(REQ-3004) - 调整项目结构 2024-11-04 14:11:33 +08:00
fe7b4e7e18 fix - 优化导入 2024-11-04 11:44:19 +08:00
771fc73ce7 fix - 调整运行时的实例同步 ES 的逻辑 2024-11-04 11:12:26 +08:00
fc21effdbe Merge remote-tracking branch 'origin/master' into feature/form_test
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/ShellUtil.java
2024-10-31 09:59:49 +08:00
8f47e90d77 Merge remote-tracking branch 'origin/feature/REQ-2752' into feature/merge_2924_2752
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
2024-10-30 13:49:40 +08:00
b18354d1be feat(REQ-2752) - 调整查询超管的默认值 2024-10-28 09:54:32 +08:00
yangqicheng
9f4bda20f4 REQ-2752-修复普通转交内容包含null字符串问题 2024-10-23 19:59:33 +08:00
20e6c76870 confirm - 调整项目的 POM 配置 2024-10-22 13:47:10 +08:00
bad28de080 confirm - 验证一些新需求的技术可行性 2024-10-18 11:07:08 +08:00
28d2495c41 feat - 测试一些表单相关功能 2024-10-17 17:09:39 +08:00
a32279acc4 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 17:10:12 +08:00
yangqicheng
f70a7d5b22 REQ-2752-转交添加额外备注 2024-10-16 16:38:13 +08:00
0943c9866a Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 18:32:00 +08:00
bf55d75ae7 feat(REQ-2752) - 调整获取指定流程实例下指定变量名的变量对象集合 2024-10-15 18:31:40 +08:00
9a8f03595c Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 18:19:33 +08:00
5c1469a57a feat(REQ-2752) - 调整获取指定流程实例下指定变量名的变量对象集合 2024-10-15 18:19:23 +08:00
2218710e10 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-14 19:30:07 +08:00
df4e13f305 feat(REQ-2752) - 调整自定义查询指定变量名的变量命令的实现逻辑 2024-10-14 15:53:37 +08:00
af304ad293 feat(REQ-2752) - 调整自定义查询指定变量名的变量命令的实现逻辑 2024-10-14 15:52:25 +08:00
507887e827 feat(REQ-2752) - 新增自定义查询实例指定的变量名的变量 2024-10-14 15:45:04 +08:00
070a215300 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 18:26:56 +08:00
yangqicheng
16a952ac7c REQ-2752-转交添加额外备注字段 2024-10-11 18:16:22 +08:00
6fc354683f Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 15:11:44 +08:00
97ac409d00 feat(REQ-2924) - 调整一些 ERROR 级别的日志打印 2024-10-11 15:10:46 +08:00
d6fda1108f Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 18:25:40 +08:00