BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 79d5c5e2dfcec9f0626ba13cb8157671f170338b

Authored by 芋道源码
Committed by Gitee
2 parents 074146c9 5b88d881

!1264 fix: 代码评审修改 

Merge pull request !1264 from Lesan/feature/bpm-子流程
Inline Side-by-side
Showing 5 changed files with 11 additions and 12 deletions
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmChildProcessMultiInstanceSourceTypeEnum.java
  View file @79d5c5e
... ... @@ -17,8 +17,8 @@ import java.util.Arrays;
17 17 public enum BpmChildProcessMultiInstanceSourceTypeEnum implements ArrayValuable<Integer> {
18 18  
19 19 FIXED_QUANTITY(1, "固定数量"),
20   - DIGITAL_FORM(2, "数字表单"),
21   - MULTI_FORM(3, "多项表单");
  20 + NUMBER_FORM(2, "数字表单"),
  21 + MULTIPLE_FORM(3, "多选表单");
22 22  
23 23 private final Integer type;
24 24 private final String name;
... ...
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 @79d5c5e
... ... @@ -509,7 +509,7 @@ public class BpmSimpleModelNodeVO {
509 509  
510 510 @Schema(description = "完成比例", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
511 511 @NotNull(message = "完成比例不能为空")
512   - private Integer completeRatio; // TODO @lesan：approveRatio 要不这个，和上面保持一致？
  512 + private Integer approveRatio;
513 513  
514 514 @Schema(description = "多实例来源类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
515 515 @NotNull(message = "多实例来源类型不能为空")
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
  View file @79d5c5e
... ... @@ -77,10 +77,10 @@ public class BpmParallelMultiInstanceBehavior extends ParallelMultiInstanceBehav
77 77 if (execution.getCurrentFlowElement() instanceof CallActivity) {
78 78 FlowElement flowElement = execution.getCurrentFlowElement();
79 79 Integer sourceType = BpmnModelUtils.parseMultiInstanceSourceType(flowElement);
80   - if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM.getType())) {
  80 + if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM.getType())) {
81 81 return execution.getVariable(super.collectionExpression.getExpressionText(), Integer.class);
82 82 }
83   - if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM.getType())) {
  83 + if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM.getType())) {
84 84 return execution.getVariable(super.collectionExpression.getExpressionText(), List.class).size();
85 85 }
86 86 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
  View file @79d5c5e
... ... @@ -71,10 +71,10 @@ public class BpmSequentialMultiInstanceBehavior extends SequentialMultiInstanceB
71 71 if (execution.getCurrentFlowElement() instanceof CallActivity) {
72 72 FlowElement flowElement = execution.getCurrentFlowElement();
73 73 Integer sourceType = BpmnModelUtils.parseMultiInstanceSourceType(flowElement);
74   - if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM.getType())) {
  74 + if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM.getType())) {
75 75 return execution.getVariable(super.collectionExpression.getExpressionText(), Integer.class);
76 76 }
77   - if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM.getType())) {
  77 + if (sourceType.equals(BpmChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM.getType())) {
78 78 return execution.getVariable(super.collectionExpression.getExpressionText(), List.class).size();
79 79 }
80 80 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
  View file @79d5c5e
... ... @@ -873,13 +873,12 @@ public class SimpleModelUtils {
873 873 if (childProcessSetting.getMultiInstanceSetting().getSourceType().equals(BpmChildProcessMultiInstanceSourceTypeEnum.FIXED_QUANTITY.getType())) {
874 874 multiInstanceCharacteristics.setLoopCardinality(childProcessSetting.getMultiInstanceSetting().getSource());
875 875 }
876   - if (childProcessSetting.getMultiInstanceSetting().getSourceType().equals(BpmChildProcessMultiInstanceSourceTypeEnum.DIGITAL_FORM.getType()) ||
877   - childProcessSetting.getMultiInstanceSetting().getSourceType().equals(BpmChildProcessMultiInstanceSourceTypeEnum.MULTI_FORM.getType())) {
  876 + if (childProcessSetting.getMultiInstanceSetting().getSourceType().equals(BpmChildProcessMultiInstanceSourceTypeEnum.NUMBER_FORM.getType()) ||
  877 + childProcessSetting.getMultiInstanceSetting().getSourceType().equals(BpmChildProcessMultiInstanceSourceTypeEnum.MULTIPLE_FORM.getType())) {
878 878 multiInstanceCharacteristics.setInputDataItem(childProcessSetting.getMultiInstanceSetting().getSource());
879 879 }
880   -// TODO @lesan：String.format(approveMethodEnum.getCompletionCondition(), String.format("%.2f", approveRatio / 100D)));
881   - multiInstanceCharacteristics.setCompletionCondition(String.format("${ nrOfCompletedInstances/nrOfInstances >= %s}",
882   - String.format("%.2f", childProcessSetting.getMultiInstanceSetting().getCompleteRatio() / 100D)));
  880 + multiInstanceCharacteristics.setCompletionCondition(String.format(BpmUserTaskApproveMethodEnum.RATIO.getCompletionCondition(),
  881 + String.format("%.2f", childProcessSetting.getMultiInstanceSetting().getApproveRatio() / 100D)));
883 882 callActivity.setLoopCharacteristics(multiInstanceCharacteristics);
884 883 addExtensionElement(callActivity, CHILD_PROCESS_MULTI_INSTANCE_SOURCE_TYPE, childProcessSetting.getMultiInstanceSetting().getSourceType());
885 884 }
... ...