修改责任部门添加筛选

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java

@@ -60,8 +60,8 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 				(String) map.get("lawEngineer"),
 				(String) map.get("engineeringInterfacePerson"),
 				(String) map.get("engineerLawSet"),
-				(String) map.get("engineerAttSet"));
+				(String) map.get("engineerAttSet"),
-//				(String) map.get("certificationEngineer"));
+				(String) map.get("firstLevelDutyTerritory"));
 		return Result.OK((String)map.get("cut"),pageList);
 	}
 	/**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java

@@ -71,7 +71,7 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
     List<ProjectRelatedPersonnel> queryList();
 
 //	List<ProjectRelatedPersonnel> queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String certificationEngineer);
-	List<ProjectRelatedPersonnel> queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String engineerLawSet,String engineerAttSet);
+	List<ProjectRelatedPersonnel> queryPageList(String projectId,String dutyTerritory,String lawEngineer,String engineeringInterfacePerson,String engineerLawSet,String engineerAttSet,String firstLevelDutyTerritory);
 
 	Map<String,Object> queryPersonByProjectId(String projectId, String dutyTerritory);
 

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<Proj
 
 			// 法规
 			//相关人员名单中取法规工程师
-			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
+			List<ProjectRelatedPersonnel> projectRelatedPersonnels = this.projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null,null);
 			List<String> lawEngineerNameList = new ArrayList<>();
 			if(projectRelatedPersonnels.size() != 0){
 				for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {

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<ProjectRelat
 	@Override
 	public List<ProjectRelatedPersonnel> queryById(String id) {
 		List<ProjectRelatedPersonnel> records = projectRelatedPersonnelMapper.queryById(id);
-		disposeData(records);
+		disposeData(records,"");
 		return records;
 	}
 
@@ -294,8 +294,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 													   String dutyTerritoryTemp,
 													   String lawEngineer,
 													   String engineeringInterfacePerson,
-													   String engineerLawSet,String engineerAttSet){
+													   String engineerLawSet,String engineerAttSet,
-//													   String certificationEngineer) {
+													   String firstLevelDutyTerritory) {
 		//查询数据
 		List<ProjectRelatedPersonnel> result = projectRelatedPersonnelMapper.queryPageList(projectId,
 				DictCodeEnum.DUTY_TERRITORY.getValue(),
@@ -336,15 +336,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						engineerAttSet);
 			}
 		}
-		disposeData(result);
+		disposeData(result,firstLevelDutyTerritory);
 		return result;
 	}
 
-	public void disposeData(List<ProjectRelatedPersonnel> records) {
+	public void disposeData(List<ProjectRelatedPersonnel> records, String firstLevelDutyTerritory) {
 
 		List<SysDictItem> sysDictItems = this.sysDictItemService.selectItemsAll();
 		Map<String, List<SysDictItem>> 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<SysDictItem> 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<SysUser> lawEngineerUsers = new ArrayList<>();
 			if (StringUtils.isNotEmpty(projectRelatedPersonnel.getLawEngineer())){
@@ -470,7 +488,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				}
 			}
 
-			String dutyTerritory = projectRelatedPersonnel.getDutyTerritory();
 			for (Map.Entry<String, List<SysDictItem>> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) {
 				String firstLevel = firstLevelMap.getKey();
 				List<SysDictItem> dutyTerritoryList = firstLevelMap.getValue();
@@ -708,13 +725,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				QueryWrapper<ProjectRelatedPersonnel> 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);