Commit Graph

725 Commits

Author SHA1 Message Date
YunaiV e892dcabac 【代码评审】BPM:子流程的多实例 2025-02-26 21:45:47 +08:00
YunaiV 3c0b9262d7 【代码评审】BPM:触发器 HTTP 异步 2025-02-26 21:34:52 +08:00
lizhixian 13c2d36eee feat:添加流程审批时校验,是否为下一个流程审批的节点 2025-02-26 17:45:35 +08:00
lizhixian 37b2fd4789 feat:调整字段名称 2025-02-26 15:59:42 +08:00
Lesan 8a9d64bbaf feat: 子流程-多实例 2025-02-26 15:18:34 +08:00
Lesan 9c9f2812e9 fix: 添加buildTimeoutBoundaryEvent方法 2025-02-26 08:59:54 +08:00
Lesan 0d886dc42b fix: 添加必要注释 2025-02-26 08:29:09 +08:00
jason 3f1cd80573 Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
2025-02-25 22:26:25 +08:00
jason 5e31062d6b 【代码评审修改】 异步 http 触发器代码评审修改 2025-02-25 22:23:12 +08:00
lizhixian b2ca263067 feat:添加描述 2025-02-25 16:29:35 +08:00
lizhixian f2909d6bb6 feat:新增自选节点审批人参数,由前端传递下个节点选择的审批人 2025-02-25 16:27:05 +08:00
YunaiV 48c976cf0a 【代码评审】BPM:子流程的超时 2025-02-25 12:41:30 +08:00
芋道源码 f7e4293ed2
!1254 BPM-子流程
Merge pull request !1254 from Lesan/feature/bpm-子流程
2025-02-25 01:46:09 +00:00
YunaiV d0fbb7677c 【代码评审】BPM:触发器 HTTP 异步 2025-02-25 07:56:05 +08:00
smallNorthLee e11529375e feat: 审批时查询下一个节点的类型是否为自选审批人是否已选择了审批人,否则由前端传递 2025-02-24 22:56:18 +08:00
lizhixian 45a72f4cd8 fix:审批接口添加审批人参数 2025-02-24 17:15:17 +08:00
lizhixian 5d16355042 fix:
1、预测节点审批人查询,如果不存在,则直接返回空,避免类型转换异常
2、如果processVariables不为空,则使用前端传递的参数值
2025-02-24 16:31:03 +08:00
Lesan 15d0a11bad feat: 子流程-超时设置 2025-02-24 15:30:15 +08:00
jason fda6aff8af 【功能优化】 异步 http 请求触发器外部回调 controller 接口 2025-02-24 13:25:22 +08:00
jason a42ad08bc9 【功能优化】 异步 http 请求触发器外部回调 controller 接口 2025-02-24 13:20:52 +08:00
Lesan dee2b7cb96 fix: 代码审查修改 2025-02-24 09:38:37 +08:00
smallNorthLee f45758b8fd feat: 审批校验自选审批人节点是否存在审批人 2025-02-23 20:12:05 +08:00
jason 8c681a77f5 Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
2025-02-22 22:53:49 +08:00
jason 3f8221ba84 【功能新增】 新增异步 http 请求触发器 2025-02-22 22:51:56 +08:00
YunaiV 254b55778f 【代码评审】BPM:子流程 2025-02-22 17:17:27 +08:00
芋道源码 10bbe741b0
!1249 feat: 子流程
Merge pull request !1249 from Lesan/feature/bpm-子流程
2025-02-22 08:39:26 +00:00
YunaiV 7a6d1bdd79 【代码评审】BPM:删除表单数据触发器 2025-02-22 16:20:04 +08:00
jason b88c09f48d Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-02-21 22:42:10 +08:00
jason cbdc081cfe 【功能优化】 删除表单数据触发器 2025-02-21 22:41:49 +08:00
Lesan 11858ca0dd feat: 子流程-子流程发起人 2025-02-21 15:40:23 +08:00
Lesan 0e48458ef7 feat: 子流程-添加高亮 2025-02-21 14:04:00 +08:00
Lesan 9698fee364 feat: 子流程 2025-02-21 09:52:43 +08:00
YunaiV ceba5b8cec 【代码评审】BPM:优化流程发起预测节点审批人是否配置在后端逻辑中实现 2025-02-19 22:35:39 +08:00
YunaiV 24f1ce16c7 【代码评审】BPM:优化流程发起预测节点审批人是否配置在后端逻辑中实现 2025-02-19 22:20:12 +08:00
芋道源码 b496ec3fd0
!1238 fix: 修复流程预测节点错误问题
Merge pull request !1238 from SamllNorth_Lee/fix/bpm
2025-02-19 14:03:56 +00:00
smallNorthLee eaa15b24ff review: 代码审查 2025-02-19 21:05:14 +08:00
smallNorthLee 248127a941 review: 代码审查 2025-02-19 20:01:38 +08:00
lizhixian 642e72ae7a review: 代码审查 2025-02-19 15:02:04 +08:00
lizhixian 29a902f37e review: 代码审查 2025-02-19 15:00:28 +08:00
lizhixian 4b89f68936 review: 代码审查 2025-02-19 14:13:08 +08:00
lizhixian cb3467ada2 review: 代码审查 2025-02-19 14:11:42 +08:00
芋道源码 243ce1ff4b
!1240 fix: Simple模型抄送节点在流程预测时未显示抄送人
Merge pull request !1240 from Lesan/feature/bpm-fix
2025-02-19 05:38:13 +00:00
YunaiV 009f1889a9 【代码评审】BPM:触发器,修改节点的评审 2025-02-19 12:55:17 +08:00
Lesan 3017933710 fix: Simple模型抄送节点在流程预测时未显示抄送人 2025-02-19 10:04:05 +08:00
lizhixian 9a83515c05 fix: 流程发起预测节点审批人是否配置在后端逻辑中实现 2025-02-18 16:06:51 +08:00
lizhixian 23ed5b780f fix: 移除节点参数,预测节点审批人是否配置在后端逻辑中实现 2025-02-18 14:13:49 +08:00
lizhixian 1f6f00164a fix: 修复流程预测错误问题 2025-02-18 10:00:36 +08:00
smallNorthLee 3265df7548 fix: 修复流程预测节点错误问题
fix: 补充校验规则,流程创建时只校验预测节点的审批人是否配置
2025-02-17 22:41:15 +08:00
smallNorthLee c68ab33dfd fix: 修复流程预测节点错误问题
fix: 补充校验规则,流程创建时只校验预测节点的审批人是否配置
2025-02-17 22:13:42 +08:00
lizhixian 5e277e020f fix: 解决流程预测审批节点错误问题 2025-02-17 16:11:00 +08:00
lizhixian 296e6ab3ad fix: 调整获得审批详情接口请求方式和参数类型,流程变量参数使用get请求传递错误 2025-02-17 16:04:52 +08:00
lizhixian 8651f2f649 fix: 添加nodeIds参数,只校验预测轨迹下的节点审批人 2025-02-17 16:03:14 +08:00
lizhixian 1023afda40 fix: 修复流程分支节点预测问题 2025-02-17 10:28:11 +08:00
lizhixian 3d20ce1a9b fix: 修复流程分支节点预测问题 2025-02-17 09:52:09 +08:00
jason 1f2222cf83 Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-02-16 08:47:31 +08:00
jason 9a4bb60a78 【功能优化】 修改表单触发器增加条件设置 2025-02-16 08:47:13 +08:00
YunaiV a4e090383b 【功能新增】BPM:已完成的列表,强制移除自动完成的“发起人”节点 2025-02-15 09:40:02 +08:00
YunaiV 56ea9d2381 【代码优化】BPM:修复停用状态下的流程删除报错问题 2025-02-15 09:21:44 +08:00
芋道源码 64ea9906ef
!1235 fix: 修复停用状态下的流程删除报错问题
Merge pull request !1235 from SamllNorth_Lee/fix/bpm
2025-02-15 01:18:50 +00:00
YunaiV e9a3773b72 【代码评审】BPM:办理人的逻辑 2025-02-15 08:48:51 +08:00
芋道源码 04fc7404e1
!1234 BPM-办理人
Merge pull request !1234 from Lesan/feature/bpm-办理人
2025-02-15 00:37:30 +00:00
lizhixian 045a224c22 fix: 修复停用状态下的流程删除报错问题 2025-02-14 15:51:57 +08:00
Lesan 00eea85a69 chore: 添加必要注释 2025-02-14 08:31:15 +08:00
Lesan ef29682230 feat: 添加节点类型以区分不同节点 2025-02-14 08:22:04 +08:00
YunaiV 8826f92d9d 【代码评审】BPM:移除流程图标非空校验,还是需要 URL 格式的校验 2025-02-13 19:59:01 +08:00
smallNorthLee 94499c0e5f fix: 移除流程图标非空校验 2025-02-13 19:49:49 +08:00
Lesan 7cf55c5300 fix: 添加节点类型以区分不同节点 2025-02-13 09:33:12 +08:00
YunaiV f289432890 【代码评审】BPM:办理人的逻辑 2025-02-12 18:46:40 +08:00
Lesan e5aede6265 feat: 办理人节点高亮处理 2025-02-12 14:10:20 +08:00
Lesan 0085b42518 feat: 办理人节点 2025-02-12 13:53:15 +08:00
YunaiV 4e9583fae4 Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-02-09 07:14:23 +08:00
YunaiV 129e9868fb 【代码评审】BPM:ID 编码器 2025-02-09 07:04:06 +08:00
芋道源码 3cbe59ace3
!1217 fix: 无时间中缀不设置Redis过期时间
Merge pull request !1217 from Lesan/feature/bpm-new
2025-02-08 22:58:03 +00:00
YunaiV 9569c3fbed 【代码评审】BPM:触发器 - 表单修改 2025-02-09 06:55:56 +08:00
jason f5050807e1 【功能优化】 优化更新流程表单数据触发器 2025-02-07 22:45:03 +08:00
jason a23b0480f1 【功能新增】 新增修改流程表单数据触发器 2025-02-06 14:14:14 +08:00
LesanOuO b4f93e832f fix: 无时间中缀不设置Redis过期时间 2025-01-27 09:25:57 +08:00
jason 362b872aa8 Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-01-26 15:36:48 +08:00
jason 44486afd95 【代码评审修复】 Http 触发器返回值处理修改 2025-01-26 15:36:14 +08:00
YunaiV f47f6d934e 【代码评审】Bpm:数据报表 2025-01-26 13:53:02 +08:00
YunaiV f8d6f1e2c4 【代码评审】Bpm:触发器的实现 2025-01-26 13:52:01 +08:00
jason 0723e4571d Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-01-26 13:00:54 +08:00
jason 53789d9b80 【功能新增】 解析 Http 请求触发器返回值,修改流程变量 2025-01-26 13:00:20 +08:00
LesanOuO 86f568280a feat: BPM-数据报表 2025-01-26 11:06:29 +08:00
YunaiV 8f16786471 【功能修复】Bpm:获取流程列表的时候,过滤租户 2025-01-25 17:52:50 +08:00
YunaiV 86dc3763fc 【代码评审】Bpm:数据报表 2025-01-25 17:16:57 +08:00
芋道源码 623a41d48c
!1215 feat: BPM-报表
Merge pull request !1215 from Lesan/feature/bpm-报表
2025-01-25 09:08:45 +00:00
LesanOuO 3342ae1be8 feat: BPM-报表 2025-01-25 13:27:37 +08:00
LesanOuO f409a67d2f feat: 抄送添加摘要 2025-01-25 10:41:27 +08:00
LesanOuO 0ef8467546 feat: 摘要设置代码评审修改 2025-01-25 10:26:41 +08:00
LesanOuO f60a4dfa6b feat: 添加Task取消理由 2025-01-25 10:24:34 +08:00
YunaiV 534c64709f 【代码评审】Bpm:触发器的实现 2025-01-25 09:49:25 +08:00
YunaiV d63e315876 【代码优化】Bpm:调整 IntArrayValuable 到 ArrayValuable 2025-01-24 22:55:21 +08:00
YunaiV bb798681f7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java
2025-01-24 22:48:37 +08:00
YunaiV 295fad7d97 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:17 +08:00
YunaiV 9d9351d066 【代码评审】Bpm:更多设置-摘要设置 2025-01-24 19:59:18 +08:00
puhui999 d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型,通过泛型指定 2025-01-24 17:31:41 +08:00
LesanOuO 39e68af120 fix: 取消摘要数组倒序 2025-01-24 13:22:57 +08:00
LesanOuO b5ba500b60 feat: BPM-更多设置-摘要设置 2025-01-24 13:11:41 +08:00
LesanOuO 8f4543a270 fix: 通过new HashMap替换clone 2025-01-24 10:30:28 +08:00
LesanOuO bcfa08f8ef fix: 类更名CustomTitleSetting->TitleSetting 2025-01-24 10:28:49 +08:00
YunaiV 846d0605d8 【代码评审】IoT:清理流程的实例们 2025-01-23 20:08:31 +08:00
芋道源码 281d3d1d53
!1194 BPM:流程清理(添加任务和抄送)
Merge pull request !1194 from Lesan/feature/bpm-流程清理
2025-01-23 12:06:17 +00:00
YunaiV a0ff1244e5 【代码评审】Bpm:更多设置-自定义标题 2025-01-23 19:19:30 +08:00
LesanOuO de297e3a78 feat: BPM-更多设置-标题设置 2025-01-23 12:06:12 +08:00
YunaiV 61e3275231 【代码评审】Bpm:触发器的实现 2025-01-23 08:13:06 +08:00
芋道源码 808f23ec49
!1204 BPM:更多设置-自动去重
Merge pull request !1204 from Lesan/feature/bpm-自动去重
2025-01-22 23:59:12 +00:00
jason 8a8dc67d72 【功能新增】新增Simple 设计器触发器节点 2025-01-22 22:18:37 +08:00
LesanOuO e548d4454e fix: 优化代码逻辑 2025-01-22 10:08:58 +08:00
LesanOuO 6317a4f361 fix: 自动通过枚举变更 2025-01-22 09:52:06 +08:00
YunaiV ca1d9e6896 【代码评审】Bpm:更多设置-自动去重(审批) 2025-01-21 09:37:38 +08:00
芋道源码 c55f77f001
!1202 BPM-更多设置-自动去重
Merge pull request !1202 from Lesan/feature/bpm-自动去重
2025-01-21 01:21:08 +00:00
Lesan 0642c5ebe4 fix: 通过理由更改 2025-01-21 08:39:32 +08:00
Lesan d8bc3a46e5 feat: BPM-更多设置-自动去重 2025-01-21 08:24:42 +08:00
Lesan 4a1fe1f307 feat: BPM-更多设置-流程编码 2025-01-20 13:35:45 +08:00
YunaiV f486790def 【代码评审】Bpm:更多设置-流程编码 2025-01-20 12:41:33 +08:00
Lesan daa718a444 feat: BPM-更多设置-流程编码 2025-01-20 11:03:39 +08:00
YunaiV c4fcd0564c 【功能评审】Bpm:将 routerDefaultFlowId 重命名,更好理解 2025-01-20 09:18:59 +08:00
Lesan e55be75357 fix: 重命名RouterCondition->RouterSetting 2025-01-20 08:39:37 +08:00
jason d36fc98f01 Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-01-19 18:33:32 +08:00
jason 96875b1e02 【代码评审修改】 条件节点设置修改 2025-01-19 18:33:02 +08:00
YunaiV 081e716e72 【功能评审】Bpm:是否填写审批意见 2025-01-19 18:27:50 +08:00
芋道源码 89728fe6ff
!1195 BPM:审批意见
Merge pull request !1195 from Lesan/feature/bpm-审批意见
2025-01-19 10:26:14 +00:00
YunaiV fcf0b562fd 【功能评审】Bpm:发起人是否允许撤销 2025-01-19 18:22:34 +08:00
Lesan 68b7a9a954 feat: 提交人权限-允许撤销审批中的申请 2025-01-19 16:42:21 +08:00
Lesan d758da489c feat: 审批意见 2025-01-19 10:14:56 +08:00
Lesan 6c3afa7c96 feat: 添加清理抄送和任务 2025-01-19 08:39:32 +08:00
YunaiV 70538320c8 【功能评审】Bpm:清理流程 2025-01-17 19:29:07 +08:00
芋道源码 a16f1120e0
!1193 BPM:流程清理
Merge pull request !1193 from Lesan/feature/bpm-流程清理
2025-01-17 11:25:47 +00:00
YunaiV bcc535e034 【功能评审】Bpm:跳过表达式 2025-01-17 19:20:22 +08:00
芋道源码 8f994af718
!1192 BPMN设计器:跳过表达式
Merge pull request !1192 from Lesan/feature/bpm-跳过表达式
2025-01-17 11:15:16 +00:00
YunaiV 9c4648e545 【功能评审】Bpm:审批签名 2025-01-17 19:07:58 +08:00
芋道源码 40082c9b49
!1191 BPM:签名功能完善
Merge pull request !1191 from Lesan/feature/bpm-n
2025-01-17 11:03:49 +00:00
Lesan 62b271fbf8 feat: 模型的流程数据清理功能 2025-01-17 14:01:02 +08:00
Lesan 93eb75552a feat: bpmn跳过表达式 2025-01-17 09:57:06 +08:00
jason 1784aab186 Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm 2025-01-16 21:03:34 +08:00
jason 610f39de05 【缺陷修复】 解决并行分支拒绝任务时,流程未结束问题 2025-01-16 21:02:49 +08:00
Lesan aba9626384 feat: 审批签名代码评审 2025-01-16 13:56:37 +08:00
YunaiV 31c2e81dd2 【功能评审】Bpm:审批签名 2025-01-16 13:12:23 +08:00
LesanOuO b2d81e0763 fix: 通过FixedValue属性方式获取监听器扩展字段 2025-01-10 12:47:31 +08:00
Lesan 71b86e6207 feat: 完善UserTask审批签名 2025-01-09 13:49:11 +08:00
Lesan 267435c90f chore: 删除TODO 2025-01-09 09:37:48 +08:00
Lesan f1296c59eb fix: restTemplate请求添加try-catch 2025-01-09 09:36:44 +08:00
Lesan 533e5c3bf5 refactor: 优化ListenerHandler写入及解析 2025-01-09 09:33:16 +08:00
Lesan a85d51cc8c fix: 添加addListenerFieldExtension方法 2025-01-09 09:26:07 +08:00
Lesan 343991445f fix: addSignEnable修改为表达式写法 2025-01-09 09:21:23 +08:00
Lesan 37cb20d964 fix: 检查所有route->router 2025-01-09 09:17:49 +08:00
Lesan fcbf1d0765 fix: defaultFlowId由后端生成 2025-01-09 09:04:39 +08:00
YunaiV 62aabc633c 【代码评审】BPM:Simple 设计器 - 签名实现 2025-01-08 22:11:52 +08:00
Lesan fd4b6ef9e4 feat: Simple设计器-userTask-添加是否需要签名字段 2025-01-08 16:55:23 +08:00