Merge remote-tracking branch 'origin/dev_vaccine_change' into dev_vaccine_change

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 String birthDay;
-    private Date birthDay;
 
     /**
      * 疫苗接种次数

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -879,10 +879,10 @@
             AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
             </if>
             <if test=" null != startBirthDay and startBirthDay != '' ">
-                AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') <![CDATA[ >= ]]> #{startBirthDay}
+                AND a.BIRTHDAY <![CDATA[ >= ]]> #{startBirthDay}
             </if>
             <if test="null != endBirthDay and endBirthDay != '' ">
-                AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') <![CDATA[ <= ]]> #{endBirthDay}
+                AND a.BIRTHDAY <![CDATA[ <= ]]> #{endBirthDay}
             </if>
             ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk)
             ) t