From 27287ed1f9ab8ca3b252b533b932cace97e58669 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Thu, 6 Apr 2023 15:12:32 +0800
Subject: [PATCH] =?UTF-8?q?UAT=20=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95-27?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 971ccd0ff..11369517f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -10618,7 +10618,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 		}
 		//相关人员名单中取法规工程师
-		List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
+		/*List<ProjectRelatedPersonnel> projectRelatedPersonnels = projectRelatedPersonnelService.queryPageList(projectLibraryId,null,null,null,null,null);
 		List<String> lawEngineerNameList = new ArrayList<>();
 		if(projectRelatedPersonnels.size() != 0){
 			for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
@@ -10638,7 +10638,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
 			}
 			sysRoles.add(sysRole);
-		}
+		}*/
 		/*List<String> certificationEngineerList = new ArrayList<>();
 		if(projectRelatedPersonnels.size() != 0){
 			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
@@ -10661,7 +10661,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			sysRoles.add(sysRole);
 		}*/
 
-		List<String> engineeringInterfacePersonList = new ArrayList<>();
+		/*List<String> engineeringInterfacePersonList = new ArrayList<>();
 		if(projectRelatedPersonnels.size() != 0){
 			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
 				String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
@@ -10680,7 +10680,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode());
 			}
 			sysRoles.add(sysRole);
-		}
+		}*/
 
 //		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
 //				|| lawEngineerNameList.contains(loginUser.getUsername())){
@@ -10695,6 +10695,39 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 //
 //		}
 
+		// 法规工程师
+		QueryWrapper<ProjectLawsInventoryEO> querylawEngineerCountWrap = new QueryWrapper<>();
+		querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		querylawEngineerCountWrap.lambda().eq(ProjectLawsInventoryEO::getRegulationOwnerId,loginUser.getId());
+		Integer lawCount = this.baseMapper.selectCount(querylawEngineerCountWrap);
+		if(lawCount > 0){
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getName());
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getCode());
+			}
+			sysRoles.add(sysRole);
+		}
+
+
+		// 工程接口人
+		QueryWrapper<ProjectLawsInventoryEO> queryEipCountWrap = new QueryWrapper<>();
+		queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+		queryEipCountWrap.lambda().eq(ProjectLawsInventoryEO::getEngineeringInterfacePerson,loginUser.getId());
+		Integer eipCount = this.baseMapper.selectCount(queryEipCountWrap);
+		if(eipCount > 0){
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getValue());
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getName());
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.INTERFACE_PERSON1.getCode());
+			}
+			sysRoles.add(sysRole);
+		}
+
 		// 责任人
 		QueryWrapper<ProjectLawsInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
 		queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);