From a52f4a0b38ab9db3cad01f34058bee090e61bda4 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Thu, 6 Apr 2023 13:07:06 +0800
Subject: [PATCH] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=8F=E5=8F=B71=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelServiceImpl.java   | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

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 66e74beb3..bcf2f4e85 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
@@ -725,9 +725,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		try {
 			String titleOne = "";
 			if(CutEnum.CN.getValue().equals(cut)){
-				titleOne = "责任领域,法规工程师,工程接口人,认证工程师,备注";
+				titleOne = "责任领域,法规工程师,工程接口人,工程接口人-法规工程师设置,工程接口人-认证工程师设置,备注";
 			}else{
-				titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Homologation Engineer,Comments";
+				titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Project Interface Person Regulation Engineer Setting,Project Interface Person Certification Engineer Setting,Comments";
 			}
 
 			//创建临时文件夹
@@ -799,8 +799,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					dataRow.createCell(0).setCellValue(dataList.get(j - 2).getDutyTerritory());
 					dataRow.createCell(1).setCellValue(dataList.get(j - 2).getLawEngineerName());
 					dataRow.createCell(2).setCellValue(dataList.get(j - 2).getEngineeringInterfacePersonName());
-					dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
-					dataRow.createCell(4).setCellValue(dataList.get(j - 2).getRemark());
+					//dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
+					dataRow.createCell(3).setCellValue(dataList.get(j - 2).getEngineerLawSetName());
+					dataRow.createCell(4).setCellValue(dataList.get(j - 2).getEngineerAttSetName());
+					dataRow.createCell(5).setCellValue(dataList.get(j - 2).getRemark());
 
 				}
 			}
@@ -1076,7 +1078,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 
 						String lawEngineerName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String engineeringInterfacePersonName = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
-						String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						// String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 
 						if(StringUtils.isBlank(lawEngineerName)){
 							projectRelatedPersonnel.setLawEngineerName("");
@@ -1088,11 +1090,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}else{
 							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
 						}
-						if(StringUtils.isBlank(certificationEngineerName)){
+						/*if(StringUtils.isBlank(certificationEngineerName)){
 							projectRelatedPersonnel.setCertificationEngineerName("");
 						}else{
 							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
-						}
+						}*/
 //						//除了责任领域全有值->可以
 //						if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
 //							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
@@ -1112,7 +1114,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 //						}
 
 						//导入的备注为数字,被识别成小数点后一位
-						Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+						Cell remarkCell = row.getCell(3, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
 						remarkCell.setCellType(CellType.STRING);
 						String remark = remarkCell.toString();
 						if(StringUtils.isNotEmpty(remark)) {
@@ -1358,7 +1360,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			if (StringUtils.isNotBlank(projectRelatedPersonnel.getCertificationEngineerName())){
 				List<String> certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(","));
 				//校验是否为项目基础表设定的认证工程师
-				List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
+				/*List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
 				List<String> baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList());
 				//转为小写后在判断
 				List<String> baseCertificationEngineerNameListTemp = new ArrayList<>();
@@ -1375,7 +1377,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}
 						break;
 					}
-				}
+				}*/
 //				for(String certificationEngineerName : certificationEngineerNameList){
 //					if(!baseCertificationEngineerNameList.contains(certificationEngineerName.toLowerCase())){
 //						//中英切换提示语
@@ -1641,25 +1643,25 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			//法规工程师异常提示语
 			if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(personnelType)){
 				if(CutEnum.CN.getValue().equals(cut)) {
-					message.append("导入的工程接口人姓名有误,请检查第" + row + "行");
+					message.append("导入的法规工程师姓名有误,请检查第" + row + "行。");
 				}else{
-					message.append("The imported engineering interface person is wrong.Please check line " + row );
+					message.append("The imported Regulatory engineer is wrong.Please check line " + row +".");
 				}
 			}
 			//认证工程师异常提示语
 			if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(personnelType)){
 				if(CutEnum.CN.getValue().equals(cut)) {
-					message.append("导入的认证工程师姓名有误,请检查第" + row + "行");
+					message.append("导入的认证工程师姓名有误,请检查第" + row + "行。");
 				}else {
-					message.append("The imported certification engineer is wrong.Please check line " + row );
+					message.append("The imported certification engineer is wrong.Please check line " + row +".");
 				}
 			}
 			//工程接口人异常提示语
 			if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(personnelType)){
 				if(CutEnum.CN.getValue().equals(cut)) {
-					message.append("导入的工程接口人姓名有误,请检查第" + row + "行");
+					message.append("导入的工程接口人姓名有误,请检查第" + row + "行。");
 				}else{
-					message.append("The imported engineering interface person is wrong.Please check line " + row );
+					message.append("The imported engineering interface person is wrong.Please check line " + row +".");
 				}
 			}
 		}else{