From 954720288ab1eafd37f5ee54a904094c65f41eaf Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 18 Apr 2022 18:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=8B=E8=BD=BD(=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

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 1ea7bcd8f..85394682e 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
@@ -271,12 +271,30 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		String fileOriName = "虚拟清单导入模板.xls";
 		String filePath = uploadpath + File.separator + fileOriName;
 		try {
-			String titleOne = "编号,标题,子标题,适用范围,状态,对应标准,实施类别,新车实施日期,在产车实施日期,WVTA ID,认证类型,认证级别,技术领域," +
-					"责任领域,适用地区,备注,设计符合性确认,Pre-homo确认,验证符合性确认";
-			String titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人";
+			String titleOne = "";
+			String titleTwo = "";
+			if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
+				titleOne = "编号,标题,子标题,适用范围,状态,对应标准,实施类别,新车实施日期,在产车实施日期,WVTA ID,认证类型,认证级别,技术领域," +
+						"责任领域,适用地区,备注,设计符合性确认,Pre-homo确认,验证符合性确认";
+				titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人";
+			}else{
+				titleOne = "serial number,title,subtitle,scope of application,state,corresponding standard,implementation category," +
+						"new car implementation date,on the production vehicle implementation date,WVTA ID,certification type," +
+						"certification level,technical field," +
+						"area of responsibility,zone of application,remarks,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," +
+						"type of deliverables,deliverable template,initiator,person liable";
+			}
+
 
 			List<String> list = Arrays.asList(titleOne.split(","));
-			int index = list.indexOf("备注") + 1;
+			int index = 0;
+			if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
+				index = list.indexOf("备注") + 1;
+			}else{
+				index = list.indexOf("remarks") + 1;
+			}
 
 			//创建临时文件夹
 			File nowFile = new File(filePath);