人员信息模块，增加查询条件

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>
+</mapper>