From 36172d0bd05139915f9173a6edeae9ecfa66ceaa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 6 Jul 2022 16:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E9=BE=84=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/EpidemicPreventionFormDTO.java     | 17 +++++++++++++++++
 .../dto/result/EpidemicPreventionResultDTO.java |  6 ++++++
 .../src/main/resources/mapper/IcResiUserDao.xml |  7 +++++++
 3 files changed, 30 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
index 345d7496b0..c1663d71d5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
@@ -1,10 +1,13 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -80,4 +83,18 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab
      * 关注类型，核酸检测：2，疫苗接种：1
      */
     private Integer attentionType;
+
+    /**
+     * 年龄段查询，起始生日
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startBirthDay;
+
+    /**
+     * 年龄段查询，截止生日
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endBirthDay;
 }
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 0639371186..0632fd9025 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,9 +1,11 @@
 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
@@ -37,6 +39,10 @@ public class EpidemicPreventionResultDTO implements Serializable {
      * 身份证
      */
     private String idCard;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date 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 9105d1d48b..688745f515 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
@@ -815,6 +815,7 @@
             HOME_ID,
             MOBILE,
             a.ID_CARD,
+            a.BIRTHDAY,
             IFNULL( b.count, 0 ) AS vaccineCount,
             IFNULL( c.count, 0 ) AS natCount
         FROM
@@ -877,6 +878,12 @@
             <if test="idCard != null and idCard != ''">
             AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
             </if>
+            <if test=" null != startBirthDay and startBirthDay != '' ">
+                AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') <![CDATA[ >= ]]> #{startBirthDay}
+            </if>
+            <if test="null != endBirthDay and endBirthDay != '' ">
+                AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') <![CDATA[ <= ]]> #{endBirthDay}
+            </if>
             ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk)
             ) t
             WHERE