From a401b993783e9b7d24c61674938f82de382f933c Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Thu, 9 Mar 2023 11:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=EF=BC=88?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E4=B8=8B=E6=8B=89=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=8A=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=E5=92=8C=E8=B2=AC=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/enums/ProjectRoleEnum.java |  3 ++
 .../ProjectLawsInventoryEOServiceImpl.java    | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java
index 5c67bfbee..05262bcc1 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java
@@ -14,6 +14,9 @@ public enum ProjectRoleEnum {
     ADMIN("系统管理员","12","admin"),
     VIEWER("Viewer","13","Viewer"),
     BRAND_ADMINISTRATOR("品牌管理员","14","BrandAdministrator"),
+    //法规清单使用
+    INTERFACE_PERSON1("工程接口人","15","Interface person"),
+    PERSON_LIABLE1("责任人","16","Person liable"),
     // 项目库-认证清单使用。
     INTERFACE_PERSON("接口人","20","Interface person"),
     PERSON_LIABLE("责任人","21","Person liable"),
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 3a774ebd0..834084bca 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
@@ -9406,6 +9406,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 			sysRoles.add(sysRole);
 		}
+
+		List<String> engineeringInterfacePersonList = new ArrayList<>();
+		if(projectRelatedPersonnels.size() != 0){
+			for(ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels){
+				String engineeringInterfacePerson = projectRelatedPersonnel.getEngineeringInterfacePersonName();
+				if(StringUtils.isNotBlank(engineeringInterfacePerson)){
+					engineeringInterfacePerson = engineeringInterfacePerson.replaceAll(" ","");
+					certificationEngineerList.addAll(Arrays.asList(engineeringInterfacePerson.split(",")));
+				}
+			}
+		}
+		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
+				|| engineeringInterfacePersonList.contains(loginUser.getUsername())){
+			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);
+		}
+
 //		if((StringUtils.isNotBlank(certificationEngineerName) && certificationEngineerName.contains(loginUser.getUsername()))
 //				|| lawEngineerNameList.contains(loginUser.getUsername())){
 //			SysRole sysRole = new SysRole();
@@ -9419,6 +9442,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 //
 //		}
 
+		// 责任人
+		QueryWrapper<ProjectLawsInventoryEO> queryDutyPersonCountWrap = new QueryWrapper<>();
+		queryDutyPersonCountWrap.lambda().eq(ProjectLawsInventoryEO::getDesignDutyId,loginUser.getId());
+		Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap);
+		if(dutyPersonCount > 0){
+			SysRole sysRole = new SysRole();
+			sysRole.setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getValue());
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getName());
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				sysRole.setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.PERSON_LIABLE1.getCode());
+			}
+			sysRoles.add(sysRole);
+		}
+