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-04 14:44:48 +08:00
parent 8886d83ba4
commit d440219c45
1 changed files with 188 additions and 112 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
+85 -9
View File
@@ -1694,31 +1694,103 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { //法规清单的责任领域
if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){ String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
if(StringUtils.isNotBlank(dutyTerritory)){
List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
List<String> lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
List<String> engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
List<String> certificationEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
List<String> lawEngineerListTemp = new ArrayList<>();
List<String> engineeringInterfacePersonListTemp = new ArrayList<>();
List<String> certificationEngineerListTemp = new ArrayList<>();
if(lawEngineerList.size() != 0){
for (String s : lawEngineerList) {
lawEngineerListTemp.addAll(Arrays.asList(s.split(",")));
}
lawEngineerListTemp = lawEngineerListTemp.stream().distinct().collect(Collectors.toList());
}
if(engineeringInterfacePersonList.size() != 0){
for (String s : engineeringInterfacePersonList) {
engineeringInterfacePersonListTemp.addAll(Arrays.asList(s.split(",")));
}
engineeringInterfacePersonListTemp = engineeringInterfacePersonListTemp.stream().distinct().collect(Collectors.toList());
}
if(certificationEngineerList.size() != 0){
for (String s : certificationEngineerList) {
certificationEngineerListTemp.addAll(Arrays.asList(s.split(",")));
}
certificationEngineerListTemp = certificationEngineerListTemp.stream().distinct().collect(Collectors.toList());
}
//法规工程师 //法规工程师
if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) { if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && lawEngineerListTemp.size() == 1) {
String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer); List<String> finalLawEngineerList = lawEngineerListTemp;
List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
.filter(e -> finalLawEngineerList.contains(e.getLawEngineer())).collect(Collectors.toList());
if(collect.size() != 0){
String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), collect.get(0),studioEngineer);
if(StringUtils.isNotEmpty(userId)){ if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setRegulationOwnerId(userId); projectLawsInventoryEO.setRegulationOwnerId(userId);
} }
} }
}
//认证工程师 //认证工程师
if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) { if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && certificationEngineerListTemp.size() == 1) {
String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer); List<String> finalCertificationEngineerList = certificationEngineerListTemp;
List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
.filter(e -> finalCertificationEngineerList.contains(e.getCertificationEngineer())).collect(Collectors.toList());
if(collect.size() != 0){
String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), collect.get(0),studioEngineer);
if(StringUtils.isNotEmpty(userId)){ if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setHomologationEngineerId(userId); projectLawsInventoryEO.setHomologationEngineerId(userId);
} }
} }
}
//项目接口人 //项目接口人
if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) { if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson()) && engineeringInterfacePersonListTemp.size() == 1) {
String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer); List<String> finalEngineeringInterfacePersonList = engineeringInterfacePersonListTemp;
List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
.filter(e -> finalEngineeringInterfacePersonList.contains(e.getEngineeringInterfacePerson())).collect(Collectors.toList());
if(collect.size() != 0){
String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), collect.get(0),studioEngineer);
if(StringUtils.isNotEmpty(userId)){ if(StringUtils.isNotEmpty(userId)){
projectLawsInventoryEO.setEngineeringInterfacePerson(userId); projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
} }
} }
}
}
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){
// //法规工程师
// if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
// String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
// if(StringUtils.isNotEmpty(userId)){
// projectLawsInventoryEO.setRegulationOwnerId(userId);
// }
// }
//
// //认证工程师
// if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
// String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
// if(StringUtils.isNotEmpty(userId)){
// projectLawsInventoryEO.setHomologationEngineerId(userId);
// }
// }
//
// //项目接口人
// if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
// String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer);
// if(StringUtils.isNotEmpty(userId)){
// projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
// }
// }
//设计符合性确认 //设计符合性确认
//发起人角色 //发起人角色
@@ -2171,7 +2243,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
for (String id : projectLawsInventoryEO.getIds().split(",")) { for (String id : projectLawsInventoryEO.getIds().split(",")) {
ProjectLawsInventoryEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); List<ProjectLawsInventoryEO> collect = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if(collect.size() != 0){
ProjectLawsInventoryEO info = collect.get(0);
ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0);
StringBuilder contentLogBuilder = new StringBuilder(); StringBuilder contentLogBuilder = new StringBuilder();
StringBuilder enContentLogBuilder = new StringBuilder(); StringBuilder enContentLogBuilder = new StringBuilder();
@@ -2287,6 +2361,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
enContentLog += enContentLogBuilder ; enContentLog += enContentLogBuilder ;
} }
} }
}
String contentIndexStart = contentLog.substring(0,contentLog.indexOf("“")); String contentIndexStart = contentLog.substring(0,contentLog.indexOf("“"));
String content= contentLog.substring(contentIndexStart.length()+1,contentLog.length()); String content= contentLog.substring(contentIndexStart.length()+1,contentLog.length());