From 0cabb928d7c87658c09e918e327364894473f129 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 9 Dec 2021 14:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3=E5=8D=95?=
 =?UTF-8?q?=20=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=A4=9A=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java  | 4 ++--
 .../sarStandItems/service/impl/SarStandItemsServiceImpl.java  | 2 +-
 .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml      | 4 ++--
 3 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 3833259b..6d387013 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
@@ -25,11 +25,11 @@ public class FindSarItemsPageReqDTO extends BasePage {
 
     @ApiModelProperty(value = "新车型实施日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date XCXSSRQ;
+    private String XCXSSRQ;
 
     @ApiModelProperty(value = "在产车实施日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date ZCCSSRQ;
+    private String ZCCSSRQ;
 
     @ApiModelProperty(value = "文件类型")
     private String fileType;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
index e71dcf59..12b12d4e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
@@ -236,7 +236,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
 
             switch (page.getOrderBy()){
                 case "itemsNum" : page.setOrderBy("ITEMS_NUM"); break;
-                default:page.setOrderBy("ITEMS_NUM"); page.setOrder("DESC");
+                default:page.setOrderBy("ITEMS_NUM"); page.setOrder("ASC");
             }
 
             switch (page.getOrder()){
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 4ed21b75..fc9e9e94 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
@@ -390,10 +390,10 @@
                 and ITEMS_NAME like CONCAT('%', #{itemsName},'%')
             </if>
             <if test="XCXSSRQ !=null">
-                and XCXSSRQ=#{XCXSSRQ}
+                and XCXSSRQ like concat('%', #{XCXSSRQ},'%')
             </if>
             <if test="ZCCSSRQ !=null">
-                and ZCCSSRQ=#{ZCCSSRQ}
+                and ZCCSSRQ like concat('%',#{ZCCSSRQ},'%')
             </if>
         </where>
     </sql>