Commit 8454ccb2 by 王志超

feat: 主工单审核阶段,配置默认的审核人员

parent b9eb55a4
Pipeline #86653 passed with stages
in 1 minute 28 seconds
......@@ -713,6 +713,9 @@ public class ChangeFlowBiz {
case NEW_CHANGE_FLOW_OWNER_APPROVE:
// 部门负责人审批节点:设置下一个审批人为变更管理员
String changeAdmin = appConfig.getChangeAdmin();
if (StringUtils.isBlank(changeAdmin)) {
log.error("[NEW_CHANGE_FLOW_OWNER_APPROVE] 变更管理员未配置,flowId:{}", flowId);
}
Map<String, Object> ownerApproveParamMap = new HashMap<>();
ownerApproveParamMap.put("type", FlowTransitionType.TYPE_APPROVED);
return handleMainFlowApprovalSubmit(changeFlowSubmitReq, flowId, flowDataDTO, uid, changeRecord, node, content,
......@@ -731,24 +734,29 @@ public class ChangeFlowBiz {
// 重要变更:走质量部负责人审批
adminApproveParamMap.put("type", FlowTransitionType.TYPE_APPROVED);
nextApproverForAdmin = appConfig.getChangeQualityLeader();
if (StringUtils.isBlank(nextApproverForAdmin)) {
log.error("[NEW_CHANGE_FLOW_ADMIN_APPROVE] 质量部负责人未配置,flowId:{}", flowId);
}
nextStatusForAdmin = ChangeStatusEnum.WAIT_QUALITY_LEADER_APPROVE;
log.info("[NEW_CHANGE_FLOW_ADMIN_APPROVE] 重要变更,需要质量部负责人审批");
} else {
// 一般变更:跳过质量部负责人审批
// 一般变更:跳过质量部负责人审批,下一个审批人为变更负责人
adminApproveParamMap.put("type", FlowTransitionType.TYPE_SKIP_QUALITY_APPROVE);
nextApproverForAdmin = null;
nextApproverForAdmin = changeRecord.getChangeCommander();
nextStatusForAdmin = ChangeStatusEnum.WAIT_EXEC_CHANGE_PLAN;
log.info("[NEW_CHANGE_FLOW_ADMIN_APPROVE] 一般变更,跳过质量部负责人审批");
log.info("[NEW_CHANGE_FLOW_ADMIN_APPROVE] 一般变更,跳过质量部负责人审批,下一个审批人为变更负责人:{}", nextApproverForAdmin);
}
return handleMainFlowApprovalSubmit(changeFlowSubmitReq, flowId, flowDataDTO, uid, changeRecord, node, content,
adminApproveParamMap, nextApproverForAdmin, nextStatusForAdmin);
case NEW_CHANGE_FLOW_QUALITY_APPROVE:
// 质量部负责人审批节点:审批通过后流转到执行变更方案
// 质量部负责人审批节点:审批通过后流转到执行变更方案,下一个审批人为变更负责人
Map<String, Object> qualityApproveParamMap = new HashMap<>();
qualityApproveParamMap.put("type", FlowTransitionType.TYPE_APPROVED);
String nextApproverForQuality = changeRecord.getChangeCommander();
log.info("[NEW_CHANGE_FLOW_QUALITY_APPROVE] 质量部负责人审批通过,下一个审批人为变更负责人:{}", nextApproverForQuality);
return handleMainFlowApprovalSubmit(changeFlowSubmitReq, flowId, flowDataDTO, uid, changeRecord, node, content,
qualityApproveParamMap, null, ChangeStatusEnum.WAIT_EXEC_CHANGE_PLAN);
qualityApproveParamMap, nextApproverForQuality, ChangeStatusEnum.WAIT_EXEC_CHANGE_PLAN);
case NEW_CHANGE_FLOW_EXE:
// 执行变更方案节点:等待所有子单完成后自动流转,不允许主动提交
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST,
......
......@@ -99,13 +99,13 @@ public class AppConfig {
/**
* 变更管理员(用于主单审批流程)
*/
@Value("${changeAdmin:}")
@Value("${changeAdmin:wb.xietao@mesg.corp.netease.com}")
private String changeAdmin;
/**
* 质量部负责人(用于主单审批流程)
*/
@Value("${changeQualityLeader:}")
@Value("${changeQualityLeader:wb.xietao@mesg.corp.netease.com}")
private String changeQualityLeader;
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment