法规意见收集-评估人
This commit is contained in:
+16
-7
@@ -13156,29 +13156,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
List<String> userIdList = new ArrayList<>();
|
||||
for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) {
|
||||
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
|
||||
//每条下的相关责任名单
|
||||
List<ProjectRelatedPersonnel> personnelList = projectRelatedPersonnelService.getPersonnelList(projectLawsInventoryEO.getProjectLibraryId(),null,null, null, null, null, null, null, null);
|
||||
if(ObjectUtils.isNotEmpty(personnelList) && StringUtils.isNotBlank(dutyTerritory)){
|
||||
personnelList = personnelList.stream().filter(e->dutyTerritory.equals(e.getDutyTerritory())).collect(Collectors.toList());
|
||||
//通过每条法规清单的责任领域去过滤相关人员名单
|
||||
personnelList = personnelList.stream().filter(e->dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
|
||||
//lawEngineer engineeringInterfacePerson engineerLawSet engineerAttSet
|
||||
List<String> collect1 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getLawEngineer())).map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.toList());
|
||||
List<String> collect2 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson())).map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).collect(Collectors.toList());
|
||||
List<String> collect3 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerLawSet).collect(Collectors.toList());
|
||||
List<String> collect4 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerLawSet())).map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.toList());
|
||||
List<String> collect4 = personnelList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineerAttSet())).map(ProjectRelatedPersonnel::getEngineerAttSet).collect(Collectors.toList());
|
||||
|
||||
if(ObjectUtils.isNotEmpty(collect1)){
|
||||
userIdList.addAll(collect1);
|
||||
for (String s : collect1) {
|
||||
userIdList.addAll(Arrays.asList(s.split(",")));
|
||||
}
|
||||
}
|
||||
if(ObjectUtils.isNotEmpty(collect2)){
|
||||
userIdList.addAll(collect2);
|
||||
for (String s : collect2) {
|
||||
userIdList.addAll(Arrays.asList(s.split(",")));
|
||||
}
|
||||
}
|
||||
if(ObjectUtils.isNotEmpty(collect3)){
|
||||
userIdList.addAll(collect3);
|
||||
for (String s : collect3) {
|
||||
userIdList.addAll(Arrays.asList(s.split(",")));
|
||||
}
|
||||
}
|
||||
if(ObjectUtils.isNotEmpty(collect4)){
|
||||
userIdList.addAll(collect4);
|
||||
for (String s : collect4) {
|
||||
userIdList.addAll(Arrays.asList(s.split(",")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
List<SysUser> sysUserList = new ArrayList<>();
|
||||
if(ObjectUtils.isNotEmpty(userIdList)){
|
||||
|
||||
Reference in New Issue
Block a user