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