Commit Graph

1241 Commits

Author SHA1 Message Date
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
56b68e5fe7 feat(REQ-2752) - 新增在途的历史审批,同步 ES 2024-10-09 18:25:04 +08:00
6cf2df0638 feat(REQ-2752) - 调整同步代码的逻辑 2024-10-09 17:00:40 +08:00
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
f9e187682b update(REQ-2752) - 修改脚本文件内容 2024-10-09 09:56:01 +08:00
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
ff6e991c34 feat(REQ-2752) - 1.调整已结束实例同步 ES 的代码设计. 2.增加记录初始同步时的操作时间. 3.增加新表用于记录操作时除开已完成的实例以外的数据(该功能可能会废弃). 2024-09-30 17:57:33 +08:00
7b81228bdb feat(REQ-2924) - 调用超管接口增加开关控制 2024-09-29 17:13:36 +08:00
b2a4c6b57b feat(REQ-2752) - 增加同步纬度数据至 ES 的逻辑 2024-09-29 16:27:36 +08:00
wangli
8bd8effa36 feat(REQ-2752) - 测试 ES 写入 2024-09-29 00:22:12 +08:00
d24e7fd2ae feat(REQ-2752) - 完善流程实例同步 ES 的文档模型 2024-09-27 18:49:17 +08:00
c3c3815180 feat(REQ-2924) - 审批人为空后,自动中止的文案修改 2024-09-26 17:39:33 +08:00
a3881085c0 feat(REQ-2924) - 添加默认的评论按钮 2024-09-26 17:35:32 +08:00
7d61d29d95 feat(REQ-2924) - 调整抄送时,处理的虚拟任务的问题 2024-09-26 15:59:15 +08:00
yangqicheng
058562a5ae REQ-2924-新建job流程实例不存在,日志降级 2024-09-26 13:40:09 +08:00
3da94cced2 feat(REQ-2924) - 修复一些测试 BUG 2024-09-26 13:07:32 +08:00
727dad23c9 feat(REQ-2924) - 调整抄送节点的 ru_task 表的数据 2024-09-26 10:55:31 +08:00
yangqicheng
fc81026ee8 REQ-2924-处理合并master分支代码冲突 2024-09-25 17:59:39 +08:00
yangqicheng
c036742415 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-2924
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessActivityApi.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessActivityService.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.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
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java
2024-09-25 17:49:37 +08:00
cbc0e38366 feat(REQ-2924) - 自定义按钮逻辑处理 2024-09-25 15:41:04 +08:00
450fa726b4 feat(REQ-2924) - 增加查询超管异常的提示 2024-09-25 14:34:48 +08:00
1a90c25252 feat(REQ-2924) - 完善节点多人时的响应数据处理 2024-09-25 10:08:27 +08:00
333abc1cb4 feat(REQ-2924) - 调整岗位、角色后,查询转交的超管后的逻辑优化 2024-09-24 14:04:01 +08:00
yangqicheng
3a826d8fa6 REQ-2924-添加附件设置到任务本地变量 2024-09-20 17:34:04 +08:00
yangqicheng
4174e4f451 REQ-2924-修复task事件消息没有附件问题 2024-09-20 15:39:38 +08:00
yangqicheng
969f5dc70b REQ-2924-修复加签日志文案多余"、"符号问题 2024-09-18 17:54:47 +08:00
yangqicheng
2b98fc5311 REQ-2924-修复自动审批节点审批任务计算错误问题 2024-09-18 15:38:46 +08:00
yangqicheng
ee04987a99 REQ-2924-增加退回次数限制校验 2024-09-14 15:52:12 +08:00
yangqicheng
adcb49c806 REQ-2924-修复查询退回节点重复问题 2024-09-14 15:10:18 +08:00
09f2d09ae1 feat(REQ-2924) - 增加防御性逻辑,避免直接跑出异常 2024-09-14 14:29:34 +08:00
e7b26a1d04 feat(REQ-2924) - 新版日志表脚本添加索引 2024-09-14 14:16:16 +08:00
668edf04ca feat(REQ-2924) - 新版日志表脚本添加索引 2024-09-14 13:56:57 +08:00
4ab77e7a4f feat(REQ-2924) - 解决回退的目标节点,有转交的情况下,日志展示不正常 2024-09-14 12:49:17 +08:00
yangqicheng
d6e837df53 REQ-2924-修复查询退回节点报错问题 2024-09-14 10:42:36 +08:00
yangqicheng
102d73e663 REQ-2924-修复当前节点按钮配置不生效问题 2024-09-13 19:34:16 +08:00
e3902f9da4 feat(REQ-2924) - 调整未来节点的日志展示 2024-09-13 19:12:56 +08:00
3e1b7a271b fix - 解决 nacos 未配置导致的启动问题 2024-09-13 18:54:14 +08:00
41a9baebaf feat(REQ-2924) - 测试业务节点卡住的告警逻辑 2024-09-13 17:33:23 +08:00