From 1ce2d5aec4b1fe2e1d7a434e68cd9b33d8aa52f9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 18 May 2022 17:04:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E4=B8=AD?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java |  8 +--
 .../impl/DummyInventoryInfoEOServiceImpl.java | 62 +++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index c9bec70f0..3742beaa3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -685,13 +685,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
         //设置维护清单的新增消息
         if (StringUtils.isNotBlank(addSerialNumber)) {
-            contentInfo += row + ". " + "This virtual list has been added serial number : " + addSerialNumber + ".\r\n";
+            contentInfo += row + ". " + "This virtual list has been added Number : " + addSerialNumber + ".\r\n";
             row++;
         }
 
         //设置维护清单的删除消息
         if (StringUtils.isNotBlank(deleteSerialNumber)) {
-            contentInfo += row + ". " + "This virtual list has been deleted serial number : " + deleteSerialNumber + ".\r\n";
+            contentInfo += row + ". " + "This virtual list has been deleted Number : " + deleteSerialNumber + ".\r\n";
             row++;
         }
 
@@ -700,7 +700,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             for (Map<String, String> infoDiff : infoDiffList) {
                 if (infoDiff.size() > 1) {
                     int infoDiffRow = 1;
-                    contentInfo += row + ". The serial Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
+                    contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
                     //标题
                     if (StringUtils.isNotBlank(infoDiff.get("title"))) {
                         List<String> list = Arrays.asList(infoDiff.get("title").split(","));
@@ -719,7 +719,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         String infoDiffOld = list.get(0);
                         String infoDiffNew = list.get(1);
                         if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "(" + infoDiffRow + "). Subtitle has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
+                            contentInfo += "(" + infoDiffRow + "). Sub-Title has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
                             infoDiffRow++;
                         }else{
                             contentLog += DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index dc86ba250..e9fce508c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -452,10 +452,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 						"设计符合性确认,Pre-homo确认,验证符合性确认";
 				titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人";
 			}else{
-				titleOne = "*serial number,subtitle,implementation category," +
-						"WVTA ID,certification type," +
-						"*certification level," +"applicable supplement,"+
-						"*area of responsibility,remarks," +
+				titleOne = "*Number,Sub-Title,Usage," +
+						"WVTA ID,Certification Type," +
+						"*Certification Level," +"Applicable Supplement,"+
+						"*Responsible Field,Comments," +
 						"design compliance check,pre-homo check,validation compliance chech";
 				titleTwo = "type of deliverables,deliverable template,initiator,person liable," +
 						"type of deliverables,deliverable template,initiator,person liable," +
@@ -468,7 +468,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
 				index = list.indexOf("备注") + 1;
 			}else{
-				index = list.indexOf("remarks") + 1;
+				index = list.indexOf("Comments") + 1;
 			}
 
 			//创建临时文件夹
@@ -525,13 +525,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 						"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
 						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
 			}else{
-				explain = "filling explanation\n" +
-						"1.import data starts at the fourth line\n" +
-						"2.all fields marked with * must be filled in\n"+
-						"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
-						"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
-						"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
-						"6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
+				explain = "Filling explanation\n" +
+						"1.Import data starts at the fourth line\n" +
+						"2.All fields marked with * must be filled in\n"+
+						"3.Certification Type,Certification Level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
+						"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
 			}
 
 
@@ -731,10 +731,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,适用增补件,*责任领域,备注," +
 					"设计交付物类型,设计交付物模板,设计发起人,设计责任人,pre交付物类型,pre交付物模板,pre发起人,pre责任人,验证交付物类型,验证交付物模板,验证发起人,验证责任人";
 		}else{
-			title = "*serial number,subtitle,implementation category," +
-					"WVTA ID,certification type," +
-					"*certification level," +"applicable supplement,"+
-					"*area of responsibility,remarks," +
+			title = "*Number,Sub-Title,Usage," +
+					"WVTA ID,Certification Type," +
+					"*Certification Level," +"Applicable Supplement,"+
+					"*Responsible Field,Comments," +
 					"design type of deliverables,design deliverable template,design initiator,design person liable," +
 					"pre type of deliverables,pre deliverable template,pre initiator,pre person liable," +
 					"verify type of deliverables,verify deliverable template,verify initiator,verify person liable";
@@ -1026,7 +1026,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			String verifyDeliverableTemplate = dummyInventoryInfoEO.getVerifyDeliverableTemplate();
 
 			//编号(输入框必填)
-			flag = must(dummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "serial number");
+			flag = must(dummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "Number");
 
 			//子标题
 			if(StringUtils.isNotBlank(subtitle)){
@@ -1067,30 +1067,30 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 
 			//实施类别(单选不必填)
-			value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type");
+			value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, implementType,msgList,"实施类别","Usage","implement_type");
 			if(StringUtils.isNotBlank(value)){
 				dummyInventoryInfoEO.setImplementType(value);
 			}
 
 			//认证类型(单选不必填)
-			value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type");
+			value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationType,msgList,"认证类型","Certification Type","attestation_type");
 			if(StringUtils.isNotBlank(value)){
 				dummyInventoryInfoEO.setAttestationType(value);
 			}
 
 			//认证级别(单选必填)
-			flag = must(dummyInventoryInfoEO, errorMsg, msgList, attestationRank,"认证级别","certification level");
+			flag = must(dummyInventoryInfoEO, errorMsg, msgList, attestationRank,"认证级别","Certification Level");
 			if(flag){
-				value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationRank,msgList,"认证级别","certification level","attestation_rank");
+				value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationRank,msgList,"认证级别","Certification Level","attestation_rank");
 				if(StringUtils.isNotBlank(value)){
 					dummyInventoryInfoEO.setAttestationRank(value);
 				}
 			}
 
 			//责任领域(多选必填)
-			flag = must(dummyInventoryInfoEO, errorMsg, msgList, dutyTerritory,"责任领域","area of responsibility");
+			flag = must(dummyInventoryInfoEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
 			if(flag){
-				value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","area of responsibility","duty_territory");
+				value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
 				if(StringUtils.isNotBlank(value)){
 					dummyInventoryInfoEO.setDutyTerritory(value);
 				}
@@ -1442,23 +1442,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			case "验证责任人": return "verifyDuty";
 
 
-			case "*serial number": return "serialNumber";
+			case "*Number": return "serialNumber";
 			case "title": return "title";
-			case "subtitle": return "subtitle";
+			case "Sub-Title": return "subtitle";
 //			case "适用范围": return "shi4Yong4Fan4Wei2";
 //			case "状态": return "state";
 //			case "对应标准": return "correspondingStandard";
-			case "implementation category": return "implementType";
+			case "Usage": return "implementType";
 //			case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
 //			case "在产车实施日期": return "implementTime";
 //			case "WVTA ID": return "wvtaId";
-			case "certification type": return "attestationType";
-			case "*certification level": return "attestationRank";
-			case "responsibility": return "applicableSupplement";
+			case "Certification Type": return "attestationType";
+			case "*Certification Level": return "attestationRank";
+			case "Applicable Supplement": return "applicableSupplement";
 //			case "技术领域": return "technologyTerritory";
-			case "*area of responsibility": return "dutyTerritory";
+			case "*Responsible Field": return "dutyTerritory";
 //			case "适用地区": return "region";
-			case "remarks": return "remark";
+			case "Comments": return "remark";
 			case "design type of deliverables": return "designDeliverableType";
 			case "design deliverable template": return "designDeliverableTemplate";
 			case "design initiator": return "designInitiator";