From 3073ad330d694857d95ef9e5100fa40555a44d8c Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 5 Aug 2021 18:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/epidemic/EpidemicUserInfoDao.xml          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index e7708ba..3983cfa 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -54,7 +54,9 @@
         uir.UNIT,
         IFNULL(uir.RETURN_STATE,'') AS RETURN_STATE ,
         IFNULL(uir.RISK_GRADE,'') AS RISK_GRADE,
-        uir.ROOM_NO
+        uir.ROOM_NO,
+        uir.OUT_LIVE_ADDRESS_NAME outLiveAddressName,
+        ui.HOUSEHOLD_REGISTER_NAME householdRegisterName
         from epidemic_user_info ui
         left join epidemic_user_inout_record uir on ui.ID_CARD=uir.ID_CARD
         where ui.DEL_FLAG='0'
@@ -127,6 +129,12 @@
                 #{grid}
             </foreach>
         </if>
+        <if test="householdRegisterName != null and householdRegisterName.trim() != ''">
+            and ui.HOUSEHOLD_REGISTER_NAME like '%${householdRegisterName}%'
+        </if>
+        <if test="outLiveAddressName != null and outLiveAddressName.trim() != ''">
+            and uir.OUT_LIVE_ADDRESS_NAME like '%${outLiveAddressName}%'
+        </if>
         GROUP BY ui.ID
         ORDER BY uir.CREATED_TIME DESC
         <if test="excelBigDataPageSize != null and excelBigDataPageIndex != null">
@@ -387,4 +395,4 @@
         AND LENGTH(ID_CARD) = 18
     </update>
 
-</mapper>
\ No newline at end of file
+</mapper>