修改江西中医药流程找人流程

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -499,22 +499,15 @@ public class ActivitiServiceImpl implements ActivitiService {
             switch (tfFlowApprove.getSetup()) {
                 case -1:
                     Optional.ofNullable(flowApproveResult).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到流程审批记录"));
-                    //广东医科大学流程
-                    if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)) {
-                        if (Objects.nonNull(flowApproveResult.getStartId())) {
-                            //获取命题已审
-                            approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-                        }
-                        if (Objects.nonNull(flowApproveResult.getPrimaryApproveId())) {
-                            //获取主任已审
-                            List<ApproveUserResult> approveUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
-                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, approveUserDirectorList));
-                        }
+                    if (Objects.nonNull(flowApproveResult.getStartId())) {
+                        //获取命题已审
+                        approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
+                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
                     }
-                    //江西中医药大学
-                    else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-
+                    if (Objects.nonNull(flowApproveResult.getPrimaryApproveId())) {
+                        //获取主任已审
+                        List<ApproveUserResult> approveUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
+                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, approveUserDirectorList));
                     }
                     break;
                 case 0:
@@ -533,7 +526,12 @@ public class ActivitiServiceImpl implements ActivitiService {
                     }
                     //江西中医药大学
                     else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-
+                        //获取命题已审
+                        approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
+                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
+                        //获取主任已审
+                        List<ApproveUserResult> approveUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
+                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, approveUserDirectorList));
                     }
                     break;
                 case 1:
@@ -572,7 +570,9 @@ public class ActivitiServiceImpl implements ActivitiService {
                     }
                     //江西中医药大学
                     else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-
+                        //获取命题已审
+                        approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
+                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
                     }
                     break;
                 case 3: