Commit 17900da7 authored by 侯彦文's avatar 侯彦文

进度计划

parent 54e9912c
...@@ -320,7 +320,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V ...@@ -320,7 +320,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
if (StringUtils.isEmpty(secretCodeKey)) { if (StringUtils.isEmpty(secretCodeKey)) {
buffer.append(String.format("第%s行密级格式不正确!", i + 1) + "</br>"); buffer.append(String.format("第%s行密级格式不正确!", i + 1) + "</br>");
} }
if (Objects.nonNull(excelVO.getSuperPlanCode())) { if (!StringUtils.isEmpty(excelVO.getSuperPlanCode())) {
//校验父级编号 //校验父级编号
ExtPlanVO extPlanVO = this.searchByNumber(excelVO.getSuperPlanCode()); ExtPlanVO extPlanVO = this.searchByNumber(excelVO.getSuperPlanCode());
if (ObjectUtils.isEmpty(extPlanVO)) { if (ObjectUtils.isEmpty(extPlanVO)) {
...@@ -329,11 +329,11 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V ...@@ -329,11 +329,11 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
} }
//校验编号是否已存在 //校验编号是否已存在
ExtPlanVO extPlanVOByNumber = this.searchByNumber(excelVO.getNumber()); ExtPlanVO extPlanVOByNumber = this.searchByNumber(excelVO.getNumber());
if (Objects.nonNull(extPlanVOByNumber)) { if (!StringUtils.isEmpty(extPlanVOByNumber)) {
buffer.append(String.format("第%s行,计划编号编号已存在", i + 1) + "</br>"); buffer.append(String.format("第%s行,计划编号编号已存在", i + 1) + "</br>");
} }
DxUserInfoVO userByName = dxUserInfoFeign.getUserByName(excelVO.getPlanExecutor()); DxUserInfoVO userByName = dxUserInfoFeign.getUserByName(excelVO.getPlanExecutor());
if (ObjectUtils.isEmpty(userByName)){ if (StringUtils.isEmpty(userByName)){
buffer.append(String.format("第%s行,计划执行人不存在", i + 1) + "</br>"); buffer.append(String.format("第%s行,计划执行人不存在", i + 1) + "</br>");
}else { }else {
excelVO.setPlanExecutorId(userByName.getId()); excelVO.setPlanExecutorId(userByName.getId());
......
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