From c68a5e737e3e80be14aae614639b948a5ee06b0f Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Tue, 18 Apr 2023 14:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=81=E5=AF=BC=E5=87=BA=E3=80=81=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=8B=E8=BD=BD=EF=BC=8C=E8=AE=A4=E8=AF=81=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectCertificationInventoryEO.java  | 10 +++++-----
 .../ProjectCertificationInventoryEOEn.java       | 11 ++++++-----
 ...ojectCertificationInventoryEOServiceImpl.java | 16 ++++++++--------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
index e17baecfb..0b9b7985a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
@@ -80,6 +80,11 @@ public class ProjectCertificationInventoryEO implements Serializable {
     @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
     private String configItem;
 
+    /**认证类型名称**/
+    @Excel(name = "认证类型", width = 20)
+    @TableField(exist = false)
+    private String attestationTypeName;
+
 	/**WVTA ID*/
 	@Excel(name = "WVTA ID", width = 20)
     @ApiModelProperty(value = "WVTA ID")
@@ -246,9 +251,4 @@ public class ProjectCertificationInventoryEO implements Serializable {
     /**认证类型*/
     @ApiModelProperty(value = "认证类型")
     private String attestationType;
-
-    /**认证类型名称**/
-    @Excel(name = "认证类型", width = 20)
-    @TableField(exist = false)
-    private String attestationTypeName;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
index 2e46eece5..6136ab470 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
@@ -78,6 +78,12 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
     private java.lang.String configItem;
 
+    /**认证类型*/
+    @Excel(name = "Certification Type", width = 20)
+    @ApiModelProperty(value = "认证类型")
+    @TableField(exist = false)
+    private String attestationTypeName;
+
     /**WVTA ID*/
     @Excel(name = "WVTA ID", width = 20)
     @ApiModelProperty(value = "WVTA ID")
@@ -219,9 +225,4 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
     @TableField(exist = false)
     private String endTimeStr;
 
-    /**认证类型*/
-    @Excel(name = "Certification Type", width = 20)
-    @ApiModelProperty(value = "认证类型")
-    @TableField(exist = false)
-    private String attestationTypeName;
 }
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 8aea66520..e2fec6d61 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
@@ -3266,12 +3266,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
 		String title = "";
 		if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-			title = "*类别,*检验项目,*配置项,*WVTA ID," +
-					"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
+			title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
+					"*标准编号,*责任领域,*工程接口人,*责任人," +
 					"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 		}else {
-			title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-					"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
+			title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
+					"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
 					"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 		}
 
@@ -4505,12 +4505,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		try {
 			String title = "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				title = "*类别,*检验项目,*配置项,*WVTA ID," +
-						"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
+				title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
+						"*标准编号,*责任领域,*工程接口人,*责任人," +
 						"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
 			}else {
-				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-						"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
+				title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
+						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
 						"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
 			}