From 9f2f853ab7ec72bbe7f528043c75104ebca1a5ca Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 27 Mar 2023 13:22:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?67170=20=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 66 +++++++++----------
 1 file changed, 31 insertions(+), 35 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 3709ca323..b14e4dd3e 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
@@ -4964,23 +4964,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String titleOne = "";
 			String titleTwo = "";
 			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
-				titleOne = "*编号,子标题,WVTA ID," +
-						"实施类别,认证类型,*认证级别,适用增补件," +
-						"*责任领域,法规工程师,认证工程师,工程接口人," +
+				titleOne = "*编号,标题,子标题," +
+						"认证类型,*认证级别,适用增补件," +
+						"*责任领域,法规工程师,工程接口人," +
 						"备注," +
-						"设计符合性确认,Pre-homo确认,验证符合性确认";
-				titleTwo = "交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," +
-						"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," +
-						"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明";
+						"设计符合性确认,验证符合性确认";
+				titleTwo = "交付物类型,交付物模板,责任人,截止时间,交付物说明," +
+						"交付物类型,交付物模板,责任人,截止时间,交付物说明";
 			}else{
-				titleOne = "*Number,Sub-Title,WVTA ID," +
-						"Usage,Certification Type,*Certification Level,Applicable Supplement," +
-						"*Responsible Field,Regulation Engineer,Homologation Engineer,Engineering Interface," +
+				titleOne = "*Number,Title,Sub-Title," +
+						"Certification Type,*Certification Level,Applicable Supplement," +
+						"*Responsible Field,Regulation Engineer,Engineering Interface," +
 						"Comments," +
-						"Design Compliance Check,Pre-homo Check,Validation Compliance Check";
-				titleTwo = "Deliverable Type,Deliverable Template,Reviewer,Assignee,Due Date,Deliverable Description," +
-						"Deliverable Type,Deliverable Template,Reviewer,Assignee,Due Date,Deliverable Description," +
-						"Deliverable Type,Deliverable Template,Reviewer,Assignee,Due Date,Deliverable Description";
+						"Design Compliance Check,Validation Compliance Check";
+				titleTwo = "Deliverable Type,Deliverable Template,Assignee,Due Date,Deliverable Description," +
+						"Deliverable Type,Deliverable Template,Assignee,Due Date,Deliverable Description";
 			}
 
 			List<String> list = Arrays.asList(titleOne.split(","));
@@ -5011,7 +5009,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			int count = 1;
 			int startLine = 0;
 			int endLine = 0;
-			int line = 5;
+			int line = 4;
 			for (int i = 0; i < index; i++) {
 				//合并单元格
 				CellRangeAddress region1 =
@@ -5068,7 +5066,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 							row.createCell(lineTemp).setCellValue(headerArr[m]);
 							Cell cell = row.getCell(lineTemp);
 							cell.setCellStyle(cellStyle);
-							lineTemp = lineTemp + 6;
+							lineTemp = lineTemp + 5;
 						}
 					}
 
@@ -5076,7 +5074,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					//titleTwo
 					String[] headerArrTwo = titleTwo.split(",");
 					for (int j = 0; j < headerArrTwo.length; j++) {
-						row.createCell(12+j).setCellValue(headerArrTwo[j]);
+						row.createCell(10+j).setCellValue(headerArrTwo[j]);
 					}
 				}else{
 					short height = (short) (7 * 252);
@@ -5604,21 +5602,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					}
 				}else{
 					if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
-						title = "*编号,子标题,WVTA ID," +
-								"实施类别,认证类型,*认证级别,适用增补件," +
-								"*责任领域,法规工程师,认证工程师,工程接口人," +
+						title = "*编号,标题,子标题," +
+								"认证类型,*认证级别,适用增补件," +
+								"*责任领域,法规工程师,工程接口人," +
 								"备注," +
-								"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间,设计交付物说明," +
-								"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间,pre交付物说明," +
-								"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间,验证交付物说明";
+								"设计交付物类型,设计交付物模板,设计责任人,设计截止时间,设计交付物说明," +
+								"验证交付物类型,验证交付物模板,验证责任人,验证截止时间,验证交付物说明";
 					}else{
-						title = "*Number,Sub-Title,WVTA ID," +
-								"Usage,Certification Type,*Certification Level,Applicable Supplement," +
-								"*Responsible Field,Regulation Engineer,Homologation Engineer,Engineering Interface," +
+						title = "*Number,Title,Sub-Title," +
+								"Certification Type,*Certification Level,Applicable Supplement," +
+								"*Responsible Field,Regulation Engineer,Engineering Interface," +
 								"Comments," +
-								"design Deliverable Type,design Deliverable Template,design Reviewer,design Assignee,design Due Date,design Deliverable Description," +
-								"pre Deliverable Type,pre Deliverable Template,pre Reviewer,pre Assignee,pre Due Date,pre Deliverable Description," +
-								"verify Deliverable Type,verify Deliverable Template,verify Reviewer,verify Assignee,verify Due Date,verify Deliverable Description";
+								"design Deliverable Type,design Deliverable Template,design Assignee,design Due Date,design Deliverable Description," +
+								"verify Deliverable Type,verify Deliverable Template,verify Assignee,verify Due Date,verify Deliverable Description";
 					}
 					//导入的数据为填写模板的数据
 					for (int i = 0; i <= rowNos; i++) {
@@ -5636,13 +5632,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									if (i == 0) {
 										cell.setCellType(HSSFCell.CELL_TYPE_STRING);
 										headerSb.append(cell.getStringCellValue() + ",");
-										if(j == 11){
+										if(j == 9){
 											break;
 										}
 									}else if(i == 1){
-										if(j > 11){
+										if(j > 9){
 											String flag = "";
-											if(11 < j && j < 18){
+											if(9 < j && j < 15){
 												if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
 													flag ="设计";
 												}else{
@@ -5650,15 +5646,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 												}
 												key = flag + headerCell.getStringCellValue();
 											}
-											if(17 < j && j < 24){
+											/*if(17 < j && j < 24){
 												if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
 													flag ="pre";
 												}else{
 													flag ="pre ";
 												}
 												key = flag + headerCell.getStringCellValue();
-											}
-											if(23 < j && j < 30){
+											}*/
+											if(14 < j && j < 20){
 												if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
 													flag ="验证";
 												}else{

From 72173d4782540593556eb7c98f9c7d9684c6bb8a Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 27 Mar 2023 13:25:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?66880=20=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8E=BB=E9=99=A4=E7=BC=96=E5=8F=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index a6ac38f13..2976585cf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -6413,8 +6413,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             FileUnZip.deleteDir(saveDirectory);
             throw new JeroBootException(html);
         } else {
+            // 66880 导入去除编号校验。
             //验证重复的标准号
-            List<String> serialNumberList = new ArrayList<>();
+            /*List<String> serialNumberList = new ArrayList<>();
             if (mapList.size() != 0) {
                 for (Map<String, Object> map : mapList) {
                     serialNumberList.add(StringUtils.valueOf(map.get("serial_number")));
@@ -6432,7 +6433,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         throw new JeroBootException(StringUtils.join(collect,",")+" already exists and cannot be added again");
                     }
                 }
-            }
+            }*/
 
             if (mapList.size() != 0) {
                 for (Map<String, Object> map : mapList) {

From d2a912bbf51da75c0642a8f180d99d10074961bc Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 27 Mar 2023 13:33:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?66936=20=E6=A8=A1=E6=9D=BF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java   | 2 +-
 .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 2 +-
 .../impl/ProjectCertificationInventoryEOServiceImpl.java    | 2 +-
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index 97b08724e..366b3c223 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
@@ -908,7 +908,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 						"3.Deliverable Type,Fields are radio attributes that must match the corresponding field option in the system\n" +
 						"4.Number,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.Category,WVTA ID,Inspection Items,Configuration Item，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";
+						"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.docx";
 			}
 
 
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 27775f894..ec4d8f52d 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
@@ -1275,7 +1275,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 						"3.Implementation category,Type of deliverables,Initiator,Person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
 						"4.Certification Type,Certification Level,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";
+						"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.docx";
 			}
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 3ddb0eca6..df309f54b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -3105,7 +3105,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						"3.Assignee,Deliverable Type,Deliverable Type,Eng. Interface,Fields are radio attributes that must match the corresponding field option in the system\n" +
 						"4.Standard No,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.Category,WVTA ID,Inspection Items,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";
+						"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.docx";
 			}
 			for(int i = 0; i < 2; i++){
 				//表头
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 b14e4dd3e..d47c120e1 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
@@ -5038,7 +5038,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				explain = "填写说明\n" +
 						"1.导入数据从第四行开始\n" +
 						"2.所有带*号的字段必须填写\n"+
-						"3.实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"3.实施类别,交付物类型,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
 						"4.认证类型,认证级别,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
 						"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
 						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
@@ -5046,10 +5046,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				explain = "Filling explanation\n" +
 						"1.Import data starts at the fourth line\n" +
 						"2.All fields marked with * must be filled in\n"+
-						"3.Usage,Deliverable Type,Reviewer,Assignee,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"3.Usage,Deliverable Type,Assignee,Fields are radio attributes that must match the corresponding field option in the system\n" +
 						"4.Certification type,Certification Level,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";
+						"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.docx";
 			}