【代码优化】工作流：优化 form 分配人的逻辑

YunaiV
1 parent b629e0a6
Showing 3 changed files with 12 additions and 8 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmTaskCandidateStrategyEnum.java
-package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept;
+package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.form;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept.AbstractBpmTaskCandidateDeptLeaderStrategy;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -17,10 +18,11 @@ import java.util.Set;
  * @author jason
  */
 @Component
-public class BpmTaskCandidateDeptLeaderOnFormStrategy extends AbstractBpmTaskCandidateDeptLeaderStrategy {
+public class BpmTaskCandidateFormSDeptLeaderStrategy extends AbstractBpmTaskCandidateDeptLeaderStrategy {
+
     @Override
     public BpmTaskCandidateStrategyEnum getStrategy() {
-        return BpmTaskCandidateStrategyEnum.DEPT_LEADER_ON_FORM;
+        return BpmTaskCandidateStrategyEnum.FORM_DEPT_LEADER;
     }
     @Override
@@ -50,4 +52,5 @@ public class BpmTaskCandidateDeptLeaderOnFormStrategy extends AbstractBpmTaskCan
         int level = Integer.parseInt(params[1]);
         return super.getMultiLevelDeptLeaderIds(Convert.toList(Long.class, result), level);
     }
+
 }
-package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.user;
+package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.form;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.user.BpmTaskCandidateUserStrategy;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -17,11 +18,11 @@ import java.util.Set;
  * @author jason
  */
 @Component
-public class BpmTaskCandidateUserFieldOnFormStrategy implements BpmTaskCandidateStrategy {
+public class BpmTaskCandidateFormUserStrategy implements BpmTaskCandidateStrategy {
     @Override
     public BpmTaskCandidateStrategyEnum getStrategy() {
-        return BpmTaskCandidateStrategyEnum.USER_FIELD_ON_FORM;
+        return BpmTaskCandidateStrategyEnum.FORM_USER;
     }
     @Override
@@ -29,8 +29,8 @@ public enum BpmTaskCandidateStrategyEnum implements IntArrayValuable {
     START_USER_DEPT_LEADER(37, "发起人部门负责人"),
     START_USER_DEPT_LEADER_MULTI(38, "发起人连续多级部门的负责人"),
     USER_GROUP(40, "用户组"),
-    USER_FIELD_ON_FORM(50, "表单内用户字段"),
-    DEPT_LEADER_ON_FORM(51, "表单内部分负责人"),
+    FORM_USER(50, "表单内用户字段"),
+    FORM_DEPT_LEADER(51, "表单内部门负责人"),
     EXPRESSION(60, "流程表达式"), // 表达式 ExpressionManager
     ASSIGN_EMPTY(1, "审批人为空"),
     ;