Commit 211419be by 王志超

feat: 工单提交,行动人字段校验

parent 926ec4ec
Pipeline #86490 passed with stages
in 1 minute 43 seconds
...@@ -65,9 +65,6 @@ public class ChangeExecRecordBiz { ...@@ -65,9 +65,6 @@ public class ChangeExecRecordBiz {
} }
changeExecProjectList.forEach(c -> { changeExecProjectList.forEach(c -> {
if (StringUtils.isBlank(c.getChangeExecUser())) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更行动人不能为空");
}
if (StringUtils.isBlank(c.getChangeExecUserEmail())) { if (StringUtils.isBlank(c.getChangeExecUserEmail())) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更行动人邮箱不能为空"); throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更行动人邮箱不能为空");
} }
......
...@@ -259,10 +259,10 @@ public class ChangeFlowBiz { ...@@ -259,10 +259,10 @@ public class ChangeFlowBiz {
} }
Assert.isTrue(changeExecProject.size() <= appConfig.getChangeExecLimit(), Assert.isTrue(changeExecProject.size() <= appConfig.getChangeExecLimit(),
"变更行动方案配置数超限"); "变更行动方案配置数超限");
// 校验变更行动方案中是否有重复的变更行动人
validateDuplicateChangeExecUser(changeExecProject);
// 校验每个行动项的必填字段 // 校验每个行动项的必填字段
changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProject); changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProject);
// 校验变更行动方案中是否有重复的变更行动人
validateDuplicateChangeExecUser(changeExecProject);
// 结束时间不可晚于第二天定时任务执行时间 // 结束时间不可晚于第二天定时任务执行时间
Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00"); Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
Assert.isTrue(changeFlowCreateReq.getChangeConfirmResultTime() >= tomorrowSpecificTime, "时间不可晚于下次执行时间"); Assert.isTrue(changeFlowCreateReq.getChangeConfirmResultTime() >= tomorrowSpecificTime, "时间不可晚于下次执行时间");
...@@ -649,10 +649,10 @@ public class ChangeFlowBiz { ...@@ -649,10 +649,10 @@ public class ChangeFlowBiz {
if (changeExecProjectList.size() > appConfig.getChangeExecLimit()) { if (changeExecProjectList.size() > appConfig.getChangeExecLimit()) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "变更行动方案配置数超限"); throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "变更行动方案配置数超限");
} }
// 校验变更行动方案中是否有重复的变更行动人
validateDuplicateChangeExecUser(changeExecProjectList);
// 校验每个行动项的必填字段 // 校验每个行动项的必填字段
changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProjectList); changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProjectList);
// 校验变更行动方案中是否有重复的变更行动人
validateDuplicateChangeExecUser(changeExecProjectList);
changeRecord.setParentChangeClassId(changeFlowSubmitReq.getParentChangeClassId()); changeRecord.setParentChangeClassId(changeFlowSubmitReq.getParentChangeClassId());
changeRecord.setSonChangeClassId(changeFlowSubmitReq.getSonChangeClassId()); changeRecord.setSonChangeClassId(changeFlowSubmitReq.getSonChangeClassId());
List<String> execDepartmentList = changeExecProjectList.stream().map(ChangeExecConfigReq::getChangeExecDepartment) List<String> execDepartmentList = changeExecProjectList.stream().map(ChangeExecConfigReq::getChangeExecDepartment)
......
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