From 5a891e63b692993401296e39f6bc6abe7b2b3782 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 23 Jun 2022 16:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProjectLawsInventoryEOEn.java      |  4 ++--
 .../ProjectLawsInventoryEOServiceImpl.java    | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java
index ce27d94d0..3c4dfea55 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java
@@ -71,7 +71,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String serialNumber;
 
 	/**标题*/
-	@Excel(name = "title", width = 20)
+	@Excel(name = "Title", width = 20)
     @ApiModelProperty(value = "标题")
     private String title;
 
@@ -101,7 +101,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     /**适用地区*/
     @ApiModelProperty(value = "适用地区")
     @Dict(dicCode ="Area")
-    @Excel(name = "Area", width = 15, dicCode = "region")
+    @Excel(name = "Area", width = 15)
     private String region;
 
 	/**对应标准*/
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 ed7f56542..f7d393ae3 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
@@ -2929,8 +2929,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			fileTemp.mkdirs();
 			//文件
 			exportFile(dataList,fileInfos);
+			String excelName = "";
+			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+				excelName = "法规清单.xlsx";
+			}else{
+				excelName = "Regulation List.xlsx";
+			}
 			//excel
-			OutputStream excelOS = new FileOutputStream(path + File.separator + "法规清单.xlsx");
+			OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
 			ExportParams exportParams = new ExportParams();
 			exportParams.setType(ExcelType.XSSF);
 			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
@@ -3069,6 +3075,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			if(StringUtils.isNotBlank(pullVerifyDeliverableType)){
 				projectLawsInventoryEOEn.setVerifyDeliverableType(pullVerifyDeliverableType);
 			}
+			//清单确认状态
+			String inventoryAffirmStatus = projectLawsInventoryEOEn.getInventoryAffirmStatus();
+			if(StringUtils.isNotBlank(inventoryAffirmStatus)){
+				projectLawsInventoryEOEn.setInventoryAffirmStatusName(inventoryAffirmStatus);
+			}
+
+			//任务确认状态
+			String taskAffirmStatus = projectLawsInventoryEOEn.getTaskAffirmStatus();
+			if(StringUtils.isNotBlank(taskAffirmStatus)){
+				projectLawsInventoryEOEn.setTaskAffirmStatusName(taskAffirmStatus);
+			}
 		}
 	}