wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,325 Commits 33 Branches 9 Tags 20 MiB
e887b560a9
Commit Graph

1273 Commits

Author SHA1 Message Date
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
wangli
727e485e17 feat(REQ-3023) - 解决不同的两个相邻业务节点无法正确推动流程 2024-12-12 17:30:50 +08:00
wangli
abc7884d26 feat(REQ-3383) - 调整创建的索引排序 2024-12-10 16:29:33 +08:00
wangli
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
wangli
cc1c6d9920 feat(REQ-3383) - 优化机器人节点完成时，可能导致数据一致的问题 2024-12-10 11:23:20 +08:00
wangli
a26557305c feat(REQ-3383) - 优化机器人节点完成时，可能导致数据一致的问题 2024-12-09 14:38:26 +08:00
wangli
5a40a0b98c feat(REQ-3004) - 调整业务节点告警 2024-12-09 11:37:21 +08:00
wangli
67b521f41b feat(REQ-3383) - 配合调整机器人节点的携带附件，并重写构造器 2024-12-09 11:21:56 +08:00
wangli
e9ae50ecba feat(REQ-3383) - 重命名函数 2024-12-09 10:35:15 +08:00
wangli
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
wangli
91c223165c feat(REQ-3383) - 日志中存在机器人节点时，日志展示不完整 2024-12-06 20:40:57 +08:00
wangli
aa5972e804 feat(REQ-3383) - 日志中存在机器人节点时，日志展示不完整 2024-12-06 19:48:56 +08:00
wangli
f717e3c09d feat(REQ-3383) - 日志中存在机器人节点时，日志展示不完整 2024-12-06 18:43:37 +08:00
wangli
f5ecf5a3f0 feat(REQ-3383) - 调整中止接口入参模型，并处理机器人问题展示问题 2024-12-06 18:31:40 +08:00
wangli
212ed6f94f feat(REQ-3004) - 调整发送异常的 md 组装逻辑 2024-12-04 10:40:38 +08:00
wangli
e1d064676b feat(REQ-3004) - 修复一些特殊配置引起的异常 2024-12-03 15:54:05 +08:00
wangli
e483d76a3a feat(REQ-3004) - 修复一些特殊配置引起的异常 2024-12-03 15:00:11 +08:00
wangli
ef80fa98a1 feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 12:30:45 +08:00
wangli
e0fbfcf039 feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 11:10:43 +08:00
wangli
407732f91e feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 10:54:52 +08:00
wangli
90901af1f6 feat(REQ-3004) - 调整模型重复的校验逻辑 2024-12-03 10:31:20 +08:00
wangli
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
wangli
8c1ee10c0e feat(REQ-3004) - 调整模型的 category 2024-12-02 20:13:45 +08:00
wangli
f4207ca658 feat(REQ-3004) - 调整模型的 category 2024-12-02 19:47:54 +08:00
wangli
acc0e7db19 feat(REQ-3004) - 调整表单值“”为需要设置默认值。为 null 时，代表字段别人工修改为空 2024-12-02 17:24:31 +08:00
wangli
e980167afc feat(REQ-3004) - 调整创建新的模型（代运营）时，模型判断逻辑 2024-12-02 16:51:49 +08:00
wangli
73273f0e80 feat(REQ-3004) - 调整创建新的模型（代运营）时，模型判断逻辑 2024-12-02 16:50:53 +08:00
wangli
e42bd7e5ec feat(REQ-3004) - 调整创建新的模型（代运营）时，模型判断逻辑 2024-12-02 16:34:18 +08:00
wangli
af66a1292b feat(REQ-3004) - 调整表单默认值数据处理的逻辑 2024-11-29 17:52:58 +08:00
wangli
e1e2403af8 feat(REQ-3004) - 调整表单默认值数据处理的逻辑 2024-11-29 17:36:24 +08:00
wangli
9368e7808a feat(REQ-3004) - 调整表单默认值数据处理的逻辑 2024-11-29 17:24:26 +08:00
wangli
43b5e8ff56 feat(REQ-3004) - 提炼表单模型处理逻辑，含处理数据 2024-11-29 16:10:44 +08:00
wangli
9bdbaca647 feat(REQ-3004) - 解决 key 与 category 的切换问题 2024-11-28 17:21:44 +08:00
wangli
d98bcd5b66 feat(REQ-3004) - 解决 key 与 category 的切换问题 2024-11-28 16:10:41 +08:00
wangli
797d2a9409 feat(REQ-3004) - 解决表单默认值返回时，剔除空字符串 2024-11-28 15:59:42 +08:00
wangli
9de032d17a feat(REQ-3004) - 解决 key 与 category 调整引起的问题 2024-11-28 15:58:41 +08:00
wangli
bcc3420917 feat(REQ-3004) - 调整返回 key 的问题 2024-11-28 15:51:17 +08:00
wangli
3b33a87d63 feat(REQ-3004) - 处理发起时表单内容 2024-11-28 15:15:03 +08:00
wangli
5f2cd081d7 feat(REQ-3004) - 添加一些用于以后扩展的注释 2024-11-28 10:02:06 +08:00
wangli
5a0075edbd feat(REQ-3004) - 调优“审批数据”查询功能 2024-11-28 09:23:35 +08:00
wangli
33e4ef8f63 feat(REQ-3004) - 调优“审批数据”查询功能 2024-11-27 20:52:58 +08:00
wangli
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
wangli
bb409d45de fix - 解决合并代码的冲突 2024-11-27 11:37:10 +08:00
wangli
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
wangli
9930f782ca fix - 关于一些批量操作，对数据库的外键约束异常信息进行过滤 2024-11-27 11:34:30 +08:00
wangli
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
wangli
98c1dc7cc8 feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 19:10:34 +08:00
wangli
4c9084613f feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 18:39:32 +08:00
wangli
421898131d feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 17:35:57 +08:00
wangli
bb0fb418b3 feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 17:14:42 +08:00
wangli
55e6b86eea feat(REQ-3004) - 代运营处理租户的问题 2024-11-26 16:54:26 +08:00
wangli
b250d0ee8d feat(REQ-3004) - 完善表索引 2024-11-26 15:16:31 +08:00
wangli
7476728287 feat(REQ-3004) - 合并多个需求，解决编译问题 2024-11-26 14:04:45 +08:00
wangli
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
wangli
cb57c28c00 Merge remote-tracking branch 'origin/feature/REQ-2595' into feature/REQ-3004 2024-11-26 14:01:44 +08:00
wangli
e0a82705c5 feat(REQ-3004) - 完善相关注释和日志打印 2024-11-26 10:17:46 +08:00
wangli
9bc8dbae71 feat(REQ-3004) - 调整获取表单实例的数据逻辑 2024-11-25 20:24:55 +08:00
wangli
a3d9dd437c feat(REQ-3004) - 添加同意动作携带表单内容的日志 2024-11-25 17:32:27 +08:00
wangli
62056d754e feat(REQ-3004) - 调整搜索实例数据的属性命名 2024-11-25 10:10:07 +08:00
wangli
475cd9a944 feat(REQ-3004) - 处理工程中现在有的 TODO 项 2024-11-22 16:51:46 +08:00
wangli
50db7c9e3f feat(REQ-3004) - 调整使用表单发起流程时，需要对附件类型做额外处理 2024-11-22 16:45:13 +08:00
wangli
6a99b1180c feat(REQ-3004) - 调整是否发送钉钉消息的控制 2024-11-21 15:51:46 +08:00
wangli
611c0351d1 feat(REQ-3004) - 调整日志报告的逻辑 2024-11-21 09:47:02 +08:00
yangqicheng
2e940e2c7a REQ-3290-转交任务不能转交给自己当前任务 2024-11-21 09:41:14 +08:00
wangli
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
wangli
1111b0c6ec feat(REQ-3004) - 详细描述获取表单数据的 API 2024-11-19 17:50:34 +08:00
wangli
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
wangli
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
wangli
afacb6aa98 feat(REQ-3004) - 集成表单引擎,测试使用 2024-11-18 17:20:46 +08:00
wangli
1677058381 feat(REQ-3004) - 处理表单字段默认值的变量解析 2024-11-15 18:29:14 +08:00
wangli
b74c3d79cd feat(REQ-3004) - 集成表单引擎 2024-11-15 15:43:37 +08:00
wangli
d4e1b97a8a feat(REQ-3004) - 集成表单引擎测试 2024-11-14 18:43:32 +08:00
wangli
7edfd1e0a0 feat(REQ-3004) - 集成表单引擎测试 2024-11-13 10:44:20 +08:00
wangli
b9c63e2e82 feat(REQ-3004) - 集成表单引擎测试 2024-11-13 09:48:01 +08:00
wangli
db9c9bec31 feat(REQ-3004) - 集成表单引擎测试 2024-11-12 10:17:49 +08:00
wangli
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
wangli
424da03bd2 feat(REQ-3004) - 集成表单引擎测试 2024-11-08 18:37:06 +08:00
wangli
2c0630f888 Merge branch 'hotfix/es-sync-fix' into feature/REQ-3004 2024-11-08 11:13:55 +08:00
wangli
2cecfd6beb feat(REQ-3004) - 测试表单引擎 2024-11-07 18:53:18 +08:00
wangli
d11c420f39 feat(REQ-3004) - 测试表单引擎 2024-11-07 17:41:26 +08:00
wangli
70d2dcbadd feat(REQ-3004) - 测试表单引擎 2024-11-06 18:12:42 +08:00
wangli
0033427234 fix - 调整 es 同步 2024-11-06 11:01:32 +08:00
wangli
df6861fbb1 feat(REQ-3004) - 测试表单引擎 2024-11-05 18:25:42 +08:00
wangli
92f4038a56 update - 测试表单引擎 2024-11-05 14:47:12 +08:00
wangli
629239e7dd feat(REQ-3004) - 调整项目结构 2024-11-04 14:11:33 +08:00
wangli
fe7b4e7e18 fix - 优化导入 2024-11-04 11:44:19 +08:00
wangli
771fc73ce7 fix - 调整运行时的实例同步 ES 的逻辑 2024-11-04 11:12:26 +08:00
wangli
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
wangli
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
wangli
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
wangli
20e6c76870 confirm - 调整项目的 POM 配置 2024-10-22 13:47:10 +08:00
wangli
bad28de080 confirm - 验证一些新需求的技术可行性 2024-10-18 11:07:08 +08:00
wangli
28d2495c41 feat - 测试一些表单相关功能 2024-10-17 17:09:39 +08:00
wangli
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
wangli
0943c9866a Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 18:32:00 +08:00
wangli
bf55d75ae7 feat(REQ-2752) - 调整获取指定流程实例下指定变量名的变量对象集合 2024-10-15 18:31:40 +08:00
wangli
9a8f03595c Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 18:19:33 +08:00
wangli
5c1469a57a feat(REQ-2752) - 调整获取指定流程实例下指定变量名的变量对象集合 2024-10-15 18:19:23 +08:00
wangli
2218710e10 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-14 19:30:07 +08:00
wangli
df4e13f305 feat(REQ-2752) - 调整自定义查询指定变量名的变量命令的实现逻辑 2024-10-14 15:53:37 +08:00
wangli
af304ad293 feat(REQ-2752) - 调整自定义查询指定变量名的变量命令的实现逻辑 2024-10-14 15:52:25 +08:00
wangli
507887e827 feat(REQ-2752) - 新增自定义查询实例指定的变量名的变量 2024-10-14 15:45:04 +08:00
wangli
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
wangli
6fc354683f Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 15:11:44 +08:00
wangli
97ac409d00 feat(REQ-2924) - 调整一些 ERROR 级别的日志打印 2024-10-11 15:10:46 +08:00
wangli
d6fda1108f Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 18:25:40 +08:00
wangli
56b68e5fe7 feat(REQ-2752) - 新增在途的历史审批，同步 ES 2024-10-09 18:25:04 +08:00
wangli
6cf2df0638 feat(REQ-2752) - 调整同步代码的逻辑 2024-10-09 17:00:40 +08:00
wangli
0ab3822607 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEngineApplication.java
 2024-10-09 09:58:47 +08:00
wangli
f9e187682b update(REQ-2752) - 修改脚本文件内容 2024-10-09 09:56:01 +08:00
wangli
ba3e681776 Merge branch 'feature/REQ-2752-wl' into feature/REQ-2752 
# Conflicts:
#	workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java
 2024-10-09 09:46:45 +08:00
wangli
58ebb10465 feat(REQ-2752) - 移除无用代码 2024-10-08 23:04:04 +08:00
yangqicheng
8fdd94000b REQ-2752-管理员配置表建表脚本 2024-10-08 13:48:18 +08:00
wangli
ec5590e9e8 feat(REQ-2752) - 解决启动时循环依赖的问题 2024-10-07 20:07:45 +08:00
wangli
a9d39e3ec5 feat(REQ-2752) - 通过 Entity 相关事件，处理在途的审批同步数据至 ES 2024-10-06 22:12:57 +08:00