From 282c87e34287edce6c07f16285522c688244eac2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 2 Aug 2022 11:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E5=8E=BB=E6=8E=89=E7=99=BE=E5=88=86?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsManifestEOServiceImpl.java    |  6 ++++--
 .../report/mapper/xml/ParamsReportDetailEOMapper.xml |  9 ++++++---
 .../impl/ParamsExportTemplateEOServiceImpl.java      | 12 ++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 85a5f5ed7..e62474aa9 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -720,12 +720,14 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	 */
 	private String getRatio(Double d1, Double d2) {
 		if (d1 == null || d2 == null || d2 <= 0) {
-			return "0.00%";
+//			return "0.00%";
+			return "0.00"; // 前端不需要返百分号
 		}
 		NumberFormat percent = NumberFormat.getPercentInstance();
 		percent.setMaximumFractionDigits(2);
 		percent.setMinimumFractionDigits(2);
-		return percent.format(d1/d2);
+		String result =  percent.format(d1/d2);
+		return result.substring(0,result.lastIndexOf("%")); // 前端不需要返百分号
 	}
 
 }
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 6db9c4628..01a75cc51 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
@@ -40,7 +40,10 @@
                     AND params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.paramsName}),'%')
                 </if>
                 <if test="paramsReportDetailEO.certCategory !=null and paramsReportDetailEO.certCategory !=''">
-                    AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%')
+                    AND
+                    <foreach collection="paramsReportDetailEO.certCategory.split(',')" index="" item="item" open="(" close=")" separator="or">
+                        cert_category LIKE CONCAT(CONCAT('%',#{item}),'%')
+                    </foreach>
                 </if>
                 <if test="paramsReportDetailEO.sdt !=null and paramsReportDetailEO.sdt !=''">
                     AND sdt in
@@ -102,7 +105,7 @@
         select *
         from params_report_detail
         <include refid="BaseQuerySql"/>
-        order by nio_number asc, sync_time desc
+        order by sync_time desc, nio_number asc
     </select>
 
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
@@ -123,7 +126,7 @@
                 #{item}
             </foreach>
         </if>
-        order by prd.nio_number ASC
+        order by prd.sync_time desc, prd.nio_number ASC
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
index b53290e5c..c4bdbb34a 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
@@ -42,10 +42,10 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl<ParamsExportT
 		// 模板名称唯一校验
 		boolean isRepeat = verifyTemplateName(paramsExportTemplateEO.getTemplateName());
 		if (isRepeat) {
-			if (CutEnum.CN.equals(paramsExportTemplateEO.getCut())) {
-				throw new JeroBootException("模板名称已存在！");
-			} else {
+			if (CutEnum.EN.getValue().equals(paramsExportTemplateEO.getCut())) {
 				throw new JeroBootException("Template Name already exists!");
+			} else {
+				throw new JeroBootException("模板名称已存在！");
 			}
 		}
 		// 处理附件模板 修改文件表关联信息connect_id  一个文件
@@ -84,10 +84,10 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl<ParamsExportT
 			// 模板名称唯一校验
 			boolean isRepeat = verifyTemplateName(paramsExportTemplateEO.getTemplateName());
 			if (isRepeat) {
-				if (CutEnum.CN.equals(paramsExportTemplateEO.getCut())) {
-					throw new JeroBootException("模板名称已存在！");
-				} else {
+				if (CutEnum.EN.getValue().equals(paramsExportTemplateEO.getCut())) {
 					throw new JeroBootException("Template Name already exists!");
+				} else {
+					throw new JeroBootException("模板名称已存在！");
 				}
 			}
 		}