Browse Source

配置文件修改

wangliang 3 năm trước cách đây
mục cha
commit
fc23081a46

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

@@ -156,6 +156,8 @@ public class ActivitiServiceImpl implements ActivitiService {
             processInstance = this.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
         } else if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.JXZYYDX.getCode())) {//江西中医药大学
             processInstance = this.startActivity(SystemConstant.JXZYY_FLOW_KEY, map);
+        } else {
+            throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
         }
         return processInstance;
     }
@@ -235,6 +237,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                         } else if (setupEnum == FlowApproveSetupEnum.PRIMARY_APPROVE) {//主任
                             directorFlowEnd(tfFlowApproveLog, sysUser);
                         }
+                    } else {
+                        throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                     }
                     tfFlowApproveLog.updateInfo(sysUser.getId());
                     tfFlowApproveLogService.saveOrUpdate(tfFlowApproveLog);
@@ -379,6 +383,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                     } else if (setupEnum == FlowApproveSetupEnum.PRIMARY_APPROVE) {//主任提交
                         this.directorSubmit(task, sysUser, tfFlowApprove, tfFlowApproveLog, tfFlowLog, remark, processDefinitionEntity, map);
                     }
+                } else {
+                    throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                 }
             }
             tfFlowApprove.updateInfo(sysUser.getId());
@@ -532,6 +538,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                         //获取主任已审
                         List<ApproveUserResult> approveUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
                         flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, approveUserDirectorList));
+                    } else {
+                        throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                     }
                     break;
                 case 1:
@@ -546,6 +554,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                         //江西中医药大学
                         else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
                             flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, new ArrayList<>()));
+                        } else {
+                            throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                         }
                     }
                     break;
@@ -573,6 +583,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                         //获取命题已审
                         approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
                         flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
+                    } else {
+                        throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                     }
                     break;
                 case 3:
@@ -598,6 +610,8 @@ public class ActivitiServiceImpl implements ActivitiService {
             } else if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.JXZYYDX.getCode())) {//江西中医药大学
                 flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList, SystemConstant.JXZYY_FLOW_KEY);
                 flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
+            } else {
+                throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
             }
         }
         flowTaskApprovePeopleAllResult.setApproveUserList(flowTaskApprovePeopleResultList);
@@ -714,6 +728,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                 //江西中医药大学
                 else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
                     approveUserResultList = sysUserService.findByJxzyyAssignApprove(realName);
+                } else {
+                    throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                 }
                 flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(approveUserResultList));
                 break;
@@ -735,6 +751,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                 else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
                     //获取教研室主任审批人
                     sysUserDirectorList = sysUserService.findByJxzyyDirectorApprove(realName, FlowApproveNameEnum.DIRECTOR);
+                } else {
+                    throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                 }
                 flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(sysUserDirectorList));
                 break;
@@ -803,6 +821,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                         //获取教研室主任审批人
                         approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
                         flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, approveUserResultList));
+                    } else {
+                        throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
                     }
                     break;
                 case 2:
@@ -823,6 +843,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                 approveUserResultList = sysUserService.findByRootApprove(courseCode, null, null, FlowApproveNameEnum.DIRECTOR);
             } else if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.JXZYYDX.getCode())) {//江西中医药大学
                 approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
+            } else {
+                throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
             }
             flowTaskApprovePeopleResultList = new LinkedList<>();
             flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, approveUserResultList));
@@ -892,6 +914,8 @@ public class ActivitiServiceImpl implements ActivitiService {
             //获取教研室主任审批人
             List<ApproveUserResult> sysUserDirectorList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
             flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, sysUserDirectorList));
+        } else {
+            throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
         }
         return flowTaskApprovePeopleResultList;
     }
@@ -961,6 +985,8 @@ public class ActivitiServiceImpl implements ActivitiService {
             else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
                 tfFlowApprove.setStatus(FlowStatusEnum.FINISH);
                 tfFlowApprove.setSetup(FlowApproveSetupEnum.FINISH.getSetup());
+            } else {
+                throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
             }
         } else {
             throw ExceptionResultEnum.ERROR.exception("流程变量值错误");