From 97e6688b02dac6b1df5cd5a3340000ce30238f7d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 23 Jun 2022 15:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98=E8=BF=81?= =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/MoveOutDetailResultDTO.java | 1 + .../src/main/resources/mapper/IcResiUserConfirmDao.xml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java index 56e68755d3..d76fdbc21b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java +++ b/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; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml index 3c1b206bc3..b85e79003a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml +++ b/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