From 788b5e733b4493aff7f20433306f002a7fe1bf46 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 May 2022 12:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/enums/ProjectRoleEnum.java        |  6 +++
 .../ProjectLawsInventoryEOServiceImpl.java    | 41 ++++++++++++++-----
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
index 93d0de5b9..526cbbbc3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java
@@ -9,6 +9,12 @@ public enum ProjectRoleEnum {
     HOMOLOGATION_ENGINEER("认证工程师","2"),
     ENGINEERING_INTERFACE_PERSON("工程接口人","3"),
     REGULATI_AND_HOMOLOGATION_ENGINEER("法规与认证工程师","4"),
+    DESIGNINITIATOR("设计符合性确认-发起人","5"),
+    DESIGNDUTY("设计符合性确认-责任人","6"),
+    PREHOMOINITIATOR("prehomo确认-发起人","7"),
+    PREHOMODUTY("prehomo确认-责任人","8"),
+    VERIFYINITIATOR("验证符合性确认-发起人","9"),
+    VERIFYDUTY("验证符合性确认-责任人","10"),
     ;
 
     String name;
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 19901580b..117a68b4c 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
@@ -2002,7 +2002,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "法规工程师";
 				nameEn = "regulatory engineer";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList,nameCn,nameEn,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
 			}
 
 			//认证工程师
@@ -2010,7 +2010,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "认证工程师";
 				nameEn = "certification engineer ";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapCertificationList,nameCn,nameEn,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue());
 			}
 
 			//工程接口人
@@ -2018,7 +2018,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "工程接口人";
 				nameEn = "engineering interface person ";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapPersonList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, homologationEngineerId, mapPersonList,nameCn,nameEn,ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
 			}
 
 
@@ -2040,7 +2040,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "设计符合性确认发起人";
 				nameEn = "confirm design conformance initiator ";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designInitiator, allPersonList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.DESIGNINITIATOR.getValue());
 			}
 
 			//责任人
@@ -2048,7 +2048,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "设计符合性确认责任人";
 				nameEn = "confirm design conformance responsible";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designDuty, allPersonList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, designDuty, allPersonList,nameCn,nameEn,ProjectRoleEnum.DESIGNDUTY.getValue());
 			}
 
 			//截止时间
@@ -2076,7 +2076,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "Pre-homo确认发起人";
 				nameEn = "Pre-homo identifies the initiator ";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, prehomoInitiator, allPersonList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList, prehomoInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.PREHOMOINITIATOR.getValue());
 			}
 
 			//责任人
@@ -2084,7 +2084,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "Pre-homo确认责任人";
 				nameEn = "Pre-homo identifies the person responsible";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,prehomoDuty, allPersonList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,prehomoDuty, allPersonList,nameCn,nameEn,ProjectRoleEnum.PREHOMODUTY.getValue());
 			}
 
 			//截止时间
@@ -2112,7 +2112,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "验证符合性确认发起人";
 				nameEn = "verify conformance validates the originator ";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,verifyInitiator, allPersonList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,verifyInitiator, allPersonList,nameCn,nameEn,ProjectRoleEnum.VERIFYINITIATOR.getValue());
 			}
 
 			//责任人
@@ -2120,7 +2120,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				nameCn = "验证符合性确认责任人";
 				nameEn = "verify conformance to confirm the responsible person ";
 				//验证人员是否存在
-				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,verifyDuty, allPersonList,nameCn,nameEn);
+				personnelVerify(projectLawsInventoryEO, errorMsg, msgList,verifyDuty, allPersonList,nameCn,nameEn,ProjectRoleEnum.VERIFYDUTY.getValue());
 			}
 
 
@@ -2193,7 +2193,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								 String errorMsg, List<String> msgList,
 								 String regulationOwnerId,
 								 List<Map<String, String>> mapList,
-								 String nameCn,String nameEn) {
+								 String nameCn,String nameEn,
+								 String fieldNumber) {
 		//单选
 		if(regulationOwnerId.contains(",")){
 			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
@@ -2210,7 +2211,25 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				String name = stringStringMap.get("name");
 				if(regulationOwnerId.equals(name)){
 					count ++;
-					projectLawsInventoryEO.setRegulationOwnerId(stringStringMap.get("value"));
+					if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setRegulationOwnerId(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setHomologationEngineerId(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setEngineeringInterfacePerson(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setDesignInitiatorId(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setDesignDutyId(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setPrehomoInitiatorId(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setPrehomoDutyId(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setVerifyInitiatorId(stringStringMap.get("value"));
+					}else if(ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)){
+						projectLawsInventoryEO.setVerifyDutyId(stringStringMap.get("value"));
+					}
 					break;
 				}
 			}