diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index dbc0f4ac..9a6ef6ec 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -313,6 +313,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl importEsRevisePlan(MultipartFile file) throws Exception { String userId = LoginUserUtil.getUserId(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TsUser::getUserId, userId); + List currentLoginUserList = tsUserService.list(queryWrapper); + if (currentLoginUserList.size() < 1) { + return Result.error("请先登录"); + } + TsUser userInfo = currentLoginUserList.get(0); + //获取文件全称 String fileNameStr = file.getOriginalFilename(); //获取最后.的位置 @@ -497,6 +505,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl drafterNameList = new ArrayList<>(); int tempCount = 1; for (String drafter : esRevisePlan.getDrafter().split(",")) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -504,16 +513,20 @@ public class EsRevisePlanServiceImpl extends ServiceImpl list = tsUserService.list(wrapper); + if (list.size() < 1) { return Result.error("第" + index + "条记录的第"+tempCount+"个起草人不存在"); } + String drafterName = list.get(0).getUname() + "(" + list.get(0).getAccount() + ")"; + drafterNameList.add(drafterName); tempCount++; } + esRevisePlan.setDrafterName(String.join(",",drafterNameList)); }else { return Result.error("第" + index + "条记录的起草人不能为空"); } if (StringUtils.isNotBlank(esRevisePlan.getResPerson())) { + List resPersonNameList = new ArrayList<>(); int tempCount = 1; for (String resPerson : esRevisePlan.getResPerson().split(",")) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -521,11 +534,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl list = tsUserService.list(wrapper); + if (list.size() < 1) { return Result.error("第" + index + "条记录的第"+tempCount+"个内部评审责任人不存在"); } + String resPersonName = list.get(0).getUname() + "(" + list.get(0).getAccount() + ")"; + resPersonNameList.add(resPersonName); } + esRevisePlan.setResPersonName(String.join(",",resPersonNameList)); }else { return Result.error("第" + index + "条记录的内部评审责任人不能为空"); } @@ -535,10 +551,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl list = tsUserService.list(wrapper); + if (list.size() < 1) { return Result.error("第" + index + "条记录的技术委员会评审负责人不存在"); } + String wgLeaderName = list.get(0).getUname() + "(" + list.get(0).getAccount() + ")"; + esRevisePlan.setWgLeaderName(wgLeaderName); }else { return Result.error("第" + index + "条记录的技术委员会评审负责人不能为空"); } @@ -615,7 +633,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl stringWrapper = workFlowFeignClient.activiti_define_start_rollBack(rollBackEO);