BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 5c5448b959336d162a09c3c00c6abdc8ac53ac0b

Authored by 芋道源码
Committed by Gitee
2 parents d36fc98f e55be753

!1198 BPM：重命名RouterCondition->RouterSetting 

Merge pull request !1198 from Lesan/feature/bpm-路由分支
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java
  View file @5c5448b
@@ -110,7 +110,7 @@ public class BpmSimpleModelNodeVO { @@ -110,7 +110,7 @@ public class BpmSimpleModelNodeVO {
110 private ConditionSetting conditionSetting; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE 110 private ConditionSetting conditionSetting; // 仅用于条件节点 BpmSimpleModelNodeType.CONDITION_NODE
111 111
112 @Schema(description = "路由分支组", example = "[]") 112 @Schema(description = "路由分支组", example = "[]")
113 - private List<RouterCondition> routerGroups; 113 + private List<RouterSetting> routerGroups;
114 114
115 @Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true 115 @Schema(description = "默认分支 ID", example = "Flow_xxx", hidden = true) // 由后端生成，所以 hidden = true
116 private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE 116 private String defaultFlowId; // 仅用于路由分支节点 BpmSimpleModelNodeType.ROUTER_BRANCH_NODE
@@ -301,7 +301,7 @@ public class BpmSimpleModelNodeVO { @@ -301,7 +301,7 @@ public class BpmSimpleModelNodeVO {
301 @Schema(description = "路由分支") 301 @Schema(description = "路由分支")
302 @Data 302 @Data
303 @Valid 303 @Valid
304 - public static class RouterCondition { 304 + public static class RouterSetting {
305 305
306 @Schema(description = "节点 Id", example = "Activity_xxx") // 跳转到该节点 306 @Schema(description = "节点 Id", example = "Activity_xxx") // 跳转到该节点
307 @NotEmpty(message = "节点 Id 不能为空") 307 @NotEmpty(message = "节点 Id 不能为空")
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
  View file @5c5448b
@@ -200,7 +200,7 @@ public class SimpleModelUtils { @@ -200,7 +200,7 @@ public class SimpleModelUtils {
200 // 3. 遍历分支节点 200 // 3. 遍历分支节点
201 if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) { 201 if (nodeType == BpmSimpleModelNodeType.ROUTER_BRANCH_NODE) {
202 // 路由分支遍历 202 // 路由分支遍历
203 - for (BpmSimpleModelNodeVO.RouterCondition router : node.getRouterGroups()) { 203 + for (BpmSimpleModelNodeVO.RouterSetting router : node.getRouterGroups()) {
204 SequenceFlow sequenceFlow = RouteBranchNodeConvert.buildSequenceFlow(node.getId(), router); 204 SequenceFlow sequenceFlow = RouteBranchNodeConvert.buildSequenceFlow(node.getId(), router);
205 process.addFlowElement(sequenceFlow); 205 process.addFlowElement(sequenceFlow);
206 } 206 }
@@ -637,7 +637,7 @@ public class SimpleModelUtils { @@ -637,7 +637,7 @@ public class SimpleModelUtils {
637 node.getConditionSetting().getConditionGroups()); 637 node.getConditionSetting().getConditionGroups());
638 } 638 }
639 639
640 - public static String buildConditionExpression(BpmSimpleModelNodeVO.RouterCondition router) { 640 + public static String buildConditionExpression(BpmSimpleModelNodeVO.RouterSetting router) {
641 return buildConditionExpression(router.getConditionType(), router.getConditionExpression(), 641 return buildConditionExpression(router.getConditionType(), router.getConditionExpression(),
642 router.getConditionGroups()); 642 router.getConditionGroups());
643 } 643 }
@@ -729,7 +729,7 @@ public class SimpleModelUtils { @@ -729,7 +729,7 @@ public class SimpleModelUtils {
729 return BpmSimpleModelNodeType.ROUTER_BRANCH_NODE; 729 return BpmSimpleModelNodeType.ROUTER_BRANCH_NODE;
730 } 730 }
731 731
732 - public static SequenceFlow buildSequenceFlow(String nodeId, BpmSimpleModelNodeVO.RouterCondition router) { 732 + public static SequenceFlow buildSequenceFlow(String nodeId, BpmSimpleModelNodeVO.RouterSetting router) {
733 String conditionExpression = ConditionNodeConvert.buildConditionExpression(router); 733 String conditionExpression = ConditionNodeConvert.buildConditionExpression(router);
734 return buildBpmnSequenceFlow(nodeId, router.getNodeId(), null, null, conditionExpression); 734 return buildBpmnSequenceFlow(nodeId, router.getNodeId(), null, null, conditionExpression);
735 } 735 }