From 9f2f853ab7ec72bbe7f528043c75104ebca1a5ca Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 27 Mar 2023 13:22:12 +0800
Subject: [PATCH] =?UTF-8?q?67170=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=E3=80=82?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=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{