From 716ef3a413a5da9e5b578ef6802381f28082238d Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Wed, 29 Mar 2023 22:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=8B=E8=BD=BD=E5=A2=9E=E5=8A=A0=E4=B8=89=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectCertificationInventoryEOServiceImpl.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 e19d7b423..42836a268 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
@@ -3837,19 +3837,19 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*WVTA ID," +
 						"*标准编号,*责任领域,*工程接口人,*责任人," +
-						"*交付物类型,交付物模板,*截止日期";
+						"*交付物类型,交付物模板,*截止日期,报告编号,产品型号,生产企业名称";
 			}else {
 				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
 						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
-						"*Deliverable Type,Deliverable Template,*Due Date";
+						"*Deliverable Type,Deliverable Template,*Due Date,Report No,Product Model,Name Of Manufacturer";
 			}
 
 			List<String> list = Arrays.asList(title.split(","));
 			int index = 0;
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				index = list.indexOf("*截止日期") + 1;
+				index = list.indexOf("生产企业名称") + 1;
 			}else{
-				index = list.indexOf("*Due Date") + 1;
+				index = list.indexOf("Name Of Manufacturer") + 1;
 			}
 
 			//创建临时文件夹
@@ -3869,7 +3869,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			cellStyleTemp.setWrapText(true);//自动换行
 
 			CellRangeAddress region =
-					new CellRangeAddress(1, 1, 0, 10); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+					new CellRangeAddress(1, 1, 0, 13); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
 			sheet.addMergedRegion(region);
 			String explain= "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){