From 913fc6e8f54a1f3fad9ec72966d6ce26b0dfeb2f Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 29 Aug 2021 19:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E5=88=86=E8=A7=A3=E5=8D=95=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=92=8C=E6=9D=A1=E6=AC=BE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java   | 4 ++--
 .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
index 27d00de4..3833259b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
@@ -24,11 +24,11 @@ public class FindSarItemsPageReqDTO extends BasePage {
     private String itemsName;
 
     @ApiModelProperty(value = "新车型实施日期")
-    @DateTimeFormat(pattern = "yyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date XCXSSRQ;
 
     @ApiModelProperty(value = "在产车实施日期")
-    @DateTimeFormat(pattern = "yyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date ZCCSSRQ;
 
     @ApiModelProperty(value = "文件类型")
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
index d9e1adf8..748bf902 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
@@ -387,12 +387,12 @@
             </if>
 
             <if test="itemsName != null and itemsName!=''">
-                and ITEMS_NAME=#{itemsName}
+                and ITEMS_NAME like CONCAT('%', #{itemsName},'%')
             </if>
-            <if test="XCXSSRQ !=null and XCXSSRQ!=''">
+            <if test="XCXSSRQ !=null">
                 and XCXSSRQ=#{XCXSSRQ}
             </if>
-            <if test="ZCCSSRQ !=null and ZCCSSRQ != ''">
+            <if test="ZCCSSRQ !=null">
                 and ZCCSSRQ=#{ZCCSSRQ}
             </if>
         </where>