法规清单--编辑(判空)
This commit is contained in:
+90
-36
@@ -2831,49 +2831,76 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
|
||||
//法规工程师
|
||||
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);
|
||||
projectLawsInventoryEO.setRegulationOwnerName(userName);
|
||||
List<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<ProjectLawsIn
|
||||
|
||||
//法规工程师
|
||||
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);
|
||||
projectLawsInventoryEO.setRegulationOwnerName(userName);
|
||||
List<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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<String> 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user