From 61da32e0c16884f16df309b41bc0202e76dc6f18 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 7 May 2022 15:50:28 +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

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 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 0ff8e7969..c906fa03c 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
@@ -1402,12 +1402,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}else{
 				titleOne = "*serial number,subtitle,WVTA ID," +
 						"*implementation category,certification type,*certification level," +
-						"*area of responsibility,*laws engineer,*authentication engineer,*engineering interface person," +
+						"*area of responsibility,laws engineer,authentication engineer,engineering interface person," +
 						"remarks," +
 						"design compliance check,pre-homo check,validation compliance chech";
-				titleTwo = "design type of deliverables,design deliverable template,design initiator,design person liable,design deadline," +
-						"pre type of deliverables,pre deliverable template,pre initiator,pre person liable,pre deadline," +
-						"verify type of deliverables,verify deliverable template,verify initiator,verify person liable,verify deadline";
+				titleTwo = "type of deliverables,deliverable template,initiator,person liable,deadline," +
+						"type of deliverables,deliverable template,initiator,person liable,deadline," +
+						"type of deliverables,deliverable template,initiator,person liable,deadline";
 			}
 
 			List<String> list = Arrays.asList(titleOne.split(","));
@@ -1609,9 +1609,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					"*implementation category,certification type,*certification level," +
 					"*area of responsibility,laws engineer,authentication engineer,engineering interface person," +
 					"remarks," +
-					"type of deliverables,deliverable template,initiator,person liable,deadline," +
-					"type of deliverables,deliverable template,initiator,person liable,deadline," +
-					"type of deliverables,deliverable template,initiator,person liable,deadline";
+					"design type of deliverables,design deliverable template,design initiator,design person liable,design deadline," +
+					"pre type of deliverables,pre deliverable template,pre initiator,pre person liable,pre deadline," +
+					"verify type of deliverables,verify deliverable template,verify initiator,verify person liable,verify deadline";
 		}
 
 		int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -1734,17 +1734,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									if(j > 10){
 										String flag = "";
 										if(10 < j && j < 16){
-											flag ="设计";
+											if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+												flag ="设计";
+											}else{
+												flag ="design ";
+											}
 											key = flag + headerCell.getStringCellValue();
 										}
 										if(15 < j && j < 21){
-											flag ="pre";
+											if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+												flag ="pre";
+											}else{
+												flag ="pre ";
+											}
 											key = flag + headerCell.getStringCellValue();
 										}
 										if(20 < j && j < 26){
-											flag ="验证";
+											if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+												flag ="验证";
+											}else{
+												flag ="verify ";
+											}
 											key = flag + headerCell.getStringCellValue();
-
 										}
 										headerSb.append(key + ",");
 									}
@@ -1790,6 +1801,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						ProjectLawsInventoryEO projectLawsInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectLawsInventoryEO.class);
 						projectLawsInventoryEOTemp.setCut(projectLawsInventoryEO.getCut());
 						projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId());
+						projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
+						projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
 						datas.add(projectLawsInventoryEOTemp);
 					}
 				}
@@ -2218,9 +2231,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		if(StringUtils.isBlank(serialNumber)){
 			errorCount ++;
 			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
-				errorMsg += "编号为必填项,不能为空";
+				errorMsg += nameCn + "为必填项,不能为空";
 			}else{
-				errorMsg += "serial number this parameter is mandatory and cannot be empty";
+				errorMsg += nameEn + "this parameter is mandatory and cannot be empty";
 			}
 			msgList.add(errorMsg);
 		}
@@ -2327,6 +2340,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			case "*serial number": return "serialNumber";
 			case "标题": return "title";
 			case "子标题": return "subtitle";
+			case "subtitle": return "subtitle";
 			case "适用范围": return "shi4Yong4Fan4Wei2";
 			case "状态": return "state";
 			case "对应标准": return "correspondingStandard";
@@ -2338,7 +2352,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			case "认证类型": return "attestationType";
 			case "certification type": return "attestationType";
 			case "*认证级别": return "attestationRank";
-			case "**certification level": return "attestationRank";
+			case "*certification level": return "attestationRank";
 			case "技术领域": return "technologyTerritory";
 			case "*责任领域": return "dutyTerritory";
 			case "*area of responsibility": return "dutyTerritory";