From 89eec16243ee2235888ec8317c93e9eadcbdb349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sat, 19 Aug 2023 19:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A3=E4=BB=BB=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 4 +-- .../IProjectRelatedPersonnelService.java | 2 +- ...ctCertificationInventoryEOServiceImpl.java | 2 +- .../ProjectRelatedPersonnelServiceImpl.java | 35 ++++++++++++++----- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index eb69d5e54..c283989e9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -60,8 +60,8 @@ public class ProjectRelatedPersonnelController extends JeroController queryList(); // List queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String certificationEngineer); - List queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String engineerLawSet,String engineerAttSet); + List queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String engineerLawSet,String engineerAttSet,String firstLevelDutyTerritory); Map queryPersonByProjectId(String projectId, String dutyTerritory); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 5ac60ebbb..276673057 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1693,7 +1693,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null); + List projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null,null); List lawEngineerNameList = new ArrayList<>(); if(projectRelatedPersonnels.size() != 0){ for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index ffd430a07..5b5e6669f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -270,7 +270,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryById(String id) { List records = projectRelatedPersonnelMapper.queryById(id); - disposeData(records); + disposeData(records,""); return records; } @@ -294,8 +294,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl result = projectRelatedPersonnelMapper.queryPageList(projectId, DictCodeEnum.DUTY_TERRITORY.getValue(), @@ -336,15 +336,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records) { + public void disposeData(List records, String firstLevelDutyTerritory) { List sysDictItems = this.sysDictItemService.selectItemsAll(); Map> firstLevelDutyTerritoryMap = this.sysDictItemService.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems); - for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { + Iterator it = records.iterator(); + while(it.hasNext()){ + ProjectRelatedPersonnel projectRelatedPersonnel = (ProjectRelatedPersonnel) it.next(); + String dutyTerritory = projectRelatedPersonnel.getDutyTerritory(); + //筛除责任部门条件 + if(StringUtils.isNotEmpty(firstLevelDutyTerritory)){ + List dutyTerrList = firstLevelDutyTerritoryMap.get(firstLevelDutyTerritory); + if(CollectionUtils.isNotEmpty(dutyTerrList)){ + boolean flag = false; + for (SysDictItem sysDict : dutyTerrList) { + if(sysDict.getItemValue().equals(dutyTerritory)){ + flag = true; + } + } + if(!flag){ + it.remove(); + } + } + } //法规工程师 List lawEngineerUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getLawEngineer())){ @@ -470,7 +488,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) { String firstLevel = firstLevelMap.getKey(); List dutyTerritoryList = firstLevelMap.getValue(); @@ -708,13 +725,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().in(ProjectRelatedPersonnel::getId, idList); records = list(queryWrapper); - disposeData(records); + disposeData(records,""); } else {//1个id records = queryById(id); } }else{ - records=queryPageList(projectId,null,null,null,null,null); + records=queryPageList(projectId,null,null,null,null,null,null); } //id无值,传全部 disposeDutyTerritory(records,cut);