From 9a0216daa9e4479e8fafd324e1115a88ad5854f7 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 28 Jul 2022 11:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98=E4=BF=AE=E6=94=B9,?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/mapper/xml/ParamsReportDetailEOMapper.xml   | 10 ++++++++--
 .../service/impl/ParamsReportDetailEOServiceImpl.java  |  2 +-
 2 files changed, 9 insertions(+), 3 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 06d76a401..6db9c4628 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
@@ -43,10 +43,16 @@
                     AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%')
                 </if>
                 <if test="paramsReportDetailEO.sdt !=null and paramsReportDetailEO.sdt !=''">
-                    AND sdt LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.sdt}),'%')
+                    AND sdt in
+                    <foreach collection="paramsReportDetailEO.sdt.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
                 </if>
                 <if test="paramsReportDetailEO.dre !=null and paramsReportDetailEO.dre !=''">
-                    AND dre LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.dre}),'%')
+                    AND dre in
+                    <foreach collection="paramsReportDetailEO.dre.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
                 </if>
                 <if test="paramsReportDetailEO.paramsManifestId !=null and paramsReportDetailEO.paramsManifestId !=''">
                     AND params_manifest_id = #{paramsReportDetailEO.paramsManifestId}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 9bf90f6c1..9756c00b3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -1285,7 +1285,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 					if (Date.class.equals(field.getType())) {
 						Date date = (Date) o;
 						String pattern = "";
-						if ("deadline".equals(varName)) {
+						if ("syncTime".equals(varName)) {
 							pattern = "yyyy-MM-dd";
 						} else {
 							pattern = "yyyy-MM-dd HH:mm:ss";