|
|
@ -69,7 +69,7 @@ |
|
|
|
b.GRID_ID, |
|
|
|
b.HOME_ID, |
|
|
|
SUBMIT_TYPE, |
|
|
|
VILLAGE_NAME + BUILD_NAME + UNIT_NAME + HOME_NAME AS newHomeName, |
|
|
|
CONCAT(a.VILLAGE_NAME, a.BUILD_NAME, a.UNIT_NAME, a.HOME_NAME) AS newHomeName, |
|
|
|
CONFIRM_RESULT |
|
|
|
FROM |
|
|
|
ic_resi_user_confirm a |
|
|
@ -80,13 +80,13 @@ |
|
|
|
AND a.SUBMIT_TYPE IN ( 'in', 'out' ) |
|
|
|
AND a.AGENCY_ID = #{agencyId} |
|
|
|
<if test="null != name and name.trim() != ''"> |
|
|
|
AND b.NAME LIKE CONCAT(('%',#{name},'%')) |
|
|
|
AND b.NAME LIKE CONCAT('%',#{name},'%') |
|
|
|
</if> |
|
|
|
<if test="null != idCard and idCard.trim() != ''"> |
|
|
|
AND b.ID_CARD LIKE CONCAT(('%',#{idCard},'%')) |
|
|
|
AND b.ID_CARD LIKE CONCAT('%',#{idCard},'%') |
|
|
|
</if> |
|
|
|
<if test="null != mobile and mobile.trim() != ''"> |
|
|
|
AND b.MOBILE LIKE CONCAT(('%',#{mobile},'%')) |
|
|
|
AND b.MOBILE LIKE CONCAT('%',#{mobile},'%') |
|
|
|
</if> |
|
|
|
<if test="null != submitType and submitType.trim() != ''"> |
|
|
|
AND SUBMIT_TYPE = #{submitType} |
|
|
@ -122,7 +122,7 @@ |
|
|
|
b.HOME_ID, |
|
|
|
a.SUBMIT_TYPE AS outType, |
|
|
|
a.GRID_NAME AS newGridName, |
|
|
|
a.VILLAGE_NAME + a.BUILD_NAME + a.UNIT_NAME + a.HOME_NAME AS newHomeName, |
|
|
|
CONCAT(a.VILLAGE_NAME, a.BUILD_NAME, a.UNIT_NAME, a.HOME_NAME) AS newHomeName, |
|
|
|
a.CONFIRM_RESULT, |
|
|
|
a.MOVE_OUT_DATE, |
|
|
|
a.DELETE_REASON, |
|
|
|