From 84466447fd6d8d86f91c2cf9a54b448b45a1f94d Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 7 Jan 2021 17:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A5=E5=9F=8E=E6=89=BE=E4=BA=BA=20-=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A5=E5=A7=93=E5=90=8D=E6=89=BE=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java | 5 ++++-
 .../src/main/resources/mapper/PopulationInformationDao.xml  | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java
index 4e83e907..3e682d30 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java
@@ -28,7 +28,10 @@ public class EpdcScreenResidentInfoByCurrentAddressFormDTO {
     /**
      * 当前居住地址
      */
-    @NotBlank(message = "居住地址不能为空")
     private String currentAddress;
+    /**
+     * 居住人姓名
+     */
+    private String residentName;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml
index e7c14ecc..b83f43cd 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml
@@ -475,6 +475,9 @@
         <if test="currentAddress!=null and currentAddress!=''">
             and t.CURRENT_ADDRESS like concat('%', #{currentAddress}, '%')
         </if>
+        <if test="residentName!=null and residentName!=''">
+            and t.RESIDENTS_NAME like concat('%', #{residentName}, '%')
+        </if>
         group by t.ID
         LIMIT #{pageIndex},#{pageSize}
     </select>
@@ -488,6 +491,9 @@
                 <if test="currentAddress!=null and currentAddress!=''">
                     and CURRENT_ADDRESS like concat('%', #{currentAddress}, '%')
                 </if>
+            <if test="residentName!=null and residentName!=''">
+                and t.RESIDENTS_NAME like concat('%', #{residentName}, '%')
+            </if>
     </select>
     <select id="selectPeopleByCurrentAddressExportList"
             resultType="com.elink.esua.epdc.dto.epdc.result.EpdcScreenResidentInfoByCurrentAddressResultDTO">