From ab46a6d8c0e7628db40ce61187985601acbce8db Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 12 May 2022 15:38:16 +0800
Subject: [PATCH] .

---
 .../java/com/epmet/dto/form/IcMoveInListFormDTO.java   | 10 ++++------
 .../src/main/resources/mapper/IcMoveInRecordDao.xml    |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java
index e7e510d247..eaeb03b6db 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcMoveInListFormDTO.java
@@ -1,10 +1,8 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description 【迁入管理】列表--接口入参
@@ -53,13 +51,13 @@ public class IcMoveInListFormDTO implements Serializable {
     /**
      * 起始迁入时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String startTime;
     /**
      * 终止迁入时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
+    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String endTime;
     /**
      * 页码
      */
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
index 1c3d49016e..eae6a3e826 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
@@ -57,10 +57,10 @@
             AND id_card = #{idCard}
         </if>
         <if test="startTime != null and startTime != '' ">
-            AND in_time <![CDATA[>=]]> #{startTime}
+            AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[>=]]> #{startTime}
         </if>
         <if test="endTime != null and endTime != '' ">
-            AND in_time <![CDATA[<=]]> #{endTime}
+            AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[<=]]> #{endTime}
         </if>
         <if test="isWeifare != null and isWeifare != '' ">
             AND is_welfare = #{isWeifare}