家庭成员迁出修改

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java

@@ -37,4 +37,5 @@ public class MoveOutDetailResultDTO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;
     private String reason;
+    private String xxdz;
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml

@@ -69,7 +69,10 @@
             b.GRID_ID,
             b.HOME_ID,
             SUBMIT_TYPE,
-            CONCAT(a.VILLAGE_NAME, a.BUILD_NAME, a.UNIT_NAME, a.HOME_NAME) AS newHomeName,
+            CASE SUBMIT_TYPE
+            WHEN 'in' THEN CONCAT(a.VILLAGE_NAME, a.BUILD_NAME, a.UNIT_NAME, a.HOME_NAME)
+            ELSE a.XXDZ
+            END AS newHomeName,
             CONFIRM_RESULT
         FROM
             ic_resi_user_confirm a
@@ -127,6 +130,7 @@
             a.MOVE_OUT_DATE,
             a.DELETE_REASON,
             a.REASON,
+            a.XXDZ,
             a.CREATED_TIME
         FROM
             ic_resi_user_confirm a