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}
- AND in_time =]]> #{startTime}
+ AND DATE_FORMAT(in_time,"%Y-%m-%d") =]]> #{startTime}
- AND in_time #{endTime}
+ AND DATE_FORMAT(in_time,"%Y-%m-%d") #{endTime}
AND is_welfare = #{isWeifare}