Commit 7ff9bc94 by 王志超

feat:调整异常返回方法

parent 9234190f
......@@ -242,13 +242,19 @@ public class ChangeFlowBiz {
Long sonChangeClassId = changeFlowCreateReq.getSonChangeClassId();
// 获取工单负责人
String changeCommander = getChangeCommander(changeFlowCreateReq, uid, parentChangeClassId, sonChangeClassId, itemIds);
Assert.notNull(changeCommander, "未查询到负责人信息");
if (changeCommander == null) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "未查询到负责人信息");
}
// 检验是否需要资料
ChangeConfig changeConfig = changeConfigService.getSonChange(sonChangeClassId);
Assert.notNull(changeConfig, "二级变更类型不存在");
if (changeConfig == null) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "二级变更类型不存在");
}
Integer needFile = changeConfig.getNeedFile();
if (NeedFileEnum.NEED.getStatus().equals(needFile)) {
Assert.notEmpty(changeFlowCreateReq.getUploadFiles(), "必须上传资料");
if (CollectionUtils.isEmpty(changeFlowCreateReq.getUploadFiles())) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "必须上传资料");
}
}
changeFlowCreateReq.setChangeDepartment(changeConfig.getChangeDepartment());
// 变更行动项不可为空,最多20项
......@@ -256,8 +262,9 @@ public class ChangeFlowBiz {
if (CollectionUtils.isEmpty(changeExecProject)) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项列表不能为空");
}
Assert.isTrue(changeExecProject.size() <= appConfig.getChangeExecLimit(),
"变更行动方案配置数超限");
if (changeExecProject.size() > appConfig.getChangeExecLimit()) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "变更行动方案配置数超限");
}
// 校验每个行动项的必填字段,首次提交,其他端不会自动提交,行动实践非必填
boolean tongzhouCreateSource = CreateSourceEnum.TONG_ZHOU.getType().equals(changeFlowCreateReq.getCreateSource());
changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProject, !tongzhouCreateSource);
......@@ -265,7 +272,10 @@ public class ChangeFlowBiz {
validateDuplicateChangeExecUser(changeExecProject);
// 结束时间不可晚于第二天定时任务执行时间
Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
Assert.isTrue(changeFlowCreateReq.getChangeConfirmResultTime() >= tomorrowSpecificTime, "时间不可晚于下次执行时间");
if (changeFlowCreateReq.getChangeConfirmResultTime() == null
|| changeFlowCreateReq.getChangeConfirmResultTime() < tomorrowSpecificTime) {
throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "时间不可晚于下次执行时间");
}
// 构建工单内容
Map<String, Object> content = buildFlowContent(uid);
// 构建变更类型
......
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