From 685c06630a50aaf06ff24d7e64f78fdd391d71d7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 26 Jul 2022 17:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E7=BC=96?= =?UTF-8?q?=E8=BE=91(=E5=88=A4=E7=A9=BA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 126 +++++++++++++----- 1 file changed, 90 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index bbe1040b2..75a6367f5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2831,49 +2831,76 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setRegulationOwnerName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setRegulationOwnerName(userName); + } } //认证工程师 if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setHomologationEngineerName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setHomologationEngineerName(userName); + } } //工程接口人 if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); + } } //发起人 if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setDesignInitiatorName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setDesignInitiatorName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setPrehomoInitiatorName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setPrehomoInitiatorName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setVerifyInitiatorName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setVerifyInitiatorName(userName); + } } //责任人 if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setDesignDutyName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setDesignDutyName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setPrehomoDutyName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setPrehomoDutyName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setVerifyDutyName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setVerifyDutyName(userName); + } } } @@ -3197,49 +3224,76 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setRegulationOwnerName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setRegulationOwnerName(userName); + } } //认证工程师 if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setHomologationEngineerName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setHomologationEngineerName(userName); + } } //工程接口人 if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); + } } //发起人 if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setDesignInitiatorName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setDesignInitiatorName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setPrehomoInitiatorName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setPrehomoInitiatorName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setVerifyInitiatorName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setVerifyInitiatorName(userName); + } } //责任人 if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setDesignDutyName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setDesignDutyName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setPrehomoDutyName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setPrehomoDutyName(userName); + } } if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { - String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); - projectLawsInventoryEO.setVerifyDutyName(userName); + List collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()); + if(collect.size() != 0){ + String userName = collect.get(0); + projectLawsInventoryEO.setVerifyDutyName(userName); + } } }