diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java index 0632fd9025..bb825e022d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java @@ -1,11 +1,9 @@ package com.epmet.dto.result; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; /** * @Description @@ -40,8 +38,7 @@ public class EpidemicPreventionResultDTO implements Serializable { */ private String idCard; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date birthDay; + private String birthDay; /** * 疫苗接种次数 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 688745f515..6bbefbd93b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -879,10 +879,10 @@ AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' ) - AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') = ]]> #{startBirthDay} + AND a.BIRTHDAY = ]]> #{startBirthDay} - AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') #{endBirthDay} + AND a.BIRTHDAY #{endBirthDay} ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk) ) t