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} + + and ui.HOUSEHOLD_REGISTER_NAME like '%${householdRegisterName}%' + + + and uir.OUT_LIVE_ADDRESS_NAME like '%${outLiveAddressName}%' + GROUP BY ui.ID ORDER BY uir.CREATED_TIME DESC @@ -387,4 +395,4 @@ AND LENGTH(ID_CARD) = 18 - \ No newline at end of file +