From d3228bbbe3e31023e89f5353d693271171ba5a66 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 29 Jun 2022 13:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9-?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E8=8B=B1=E6=96=87=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/report/mapper/xml/ParamsReportDetailEOMapper.xml   | 2 +-
 .../cert/template/service/impl/ParamsInfoEOServiceImpl.java | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 92ba7dddd..060cf0d4e 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -88,7 +88,7 @@
         select *
         from params_report_detail
         <include refid="BaseQuerySql"/>
-        order by nio_number asc, sync_time asc
+        order by nio_number asc, sync_time desc
     </select>
 
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index c7a2324f2..a02b651ac 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -435,7 +435,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			//判断导出文件名称
 			String exportName = "";
 			if(StringUtils.isEmpty(exportName)){
-				exportName="参数项导出数据";
+				if (CutEnum.EN.getValue().equals(cut)) {
+					exportName = "Parameter Export Data";
+				} else {
+					exportName = "参数项导出数据";
+				}
 			}else{
 				exportName = exportExcelName;
 			}