查看分解单 实施日期多个

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;

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()){

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>