WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

法规清单--编辑(判空)

Browse Source
This commit is contained in:
zhn
2022-07-26 17:01:36 +08:00
parent 2ca19d1120
commit 685c06630a
1 changed files with 90 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+90 -36
View File
@@ -2831,49 +2831,76 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//法规工程师 //法规工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setRegulationOwnerName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setRegulationOwnerName(userName);
}
} }
//认证工程师 //认证工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setHomologationEngineerName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setHomologationEngineerName(userName);
}
} }
//工程接口人 //工程接口人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setEngineeringInterfacePersonName(userName);
}
} }
//发起人 //发起人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setDesignInitiatorName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setDesignInitiatorName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setPrehomoInitiatorName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setPrehomoInitiatorName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setVerifyInitiatorName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setVerifyInitiatorName(userName);
}
} }
//责任人 //责任人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setDesignDutyName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setDesignDutyName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setPrehomoDutyName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setPrehomoDutyName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setVerifyDutyName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setVerifyDutyName(userName);
}
} }
} }
@@ -3197,49 +3224,76 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//法规工程师 //法规工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setRegulationOwnerName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setRegulationOwnerName(userName);
}
} }
//认证工程师 //认证工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setHomologationEngineerName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setHomologationEngineerName(userName);
}
} }
//工程接口人 //工程接口人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setEngineeringInterfacePersonName(userName);
}
} }
//发起人 //发起人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setDesignInitiatorName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setDesignInitiatorName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setPrehomoInitiatorName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setPrehomoInitiatorName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setVerifyInitiatorName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setVerifyInitiatorName(userName);
}
} }
//责任人 //责任人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setDesignDutyName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setDesignDutyName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setPrehomoDutyName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setPrehomoDutyName(userName);
}
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { 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); List<String> collect = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList());
projectLawsInventoryEO.setVerifyDutyName(userName); if(collect.size() != 0){
String userName = collect.get(0);
projectLawsInventoryEO.setVerifyDutyName(userName);
}
} }
} }