From cd6a530ea43bf03fe6e16de9dafcf165430f37dc Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 31 Oct 2022 16:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E8=BF=81=E5=87=BA=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=93=8D=E4=BD=9C=E5=88=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A5=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=9A=84=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/ChangeDeathDTO.java    |  5 ++
 .../com/epmet/dto/ChangeRelocationDTO.java    |  5 ++
 .../dto/result/IcMoveInListResultDTO.java     |  6 ++
 .../main/resources/mapper/ChangeDeathDao.xml  |  1 +
 .../resources/mapper/ChangeRelocationDao.xml  |  3 +-
 .../resources/mapper/IcMoveInRecordDao.xml    | 86 +++++++++----------
 6 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
index 879732a1b4..f771404184 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeDeathDTO.java
@@ -26,6 +26,11 @@ public class ChangeDeathDTO implements Serializable {
      */
     private String id;
 
+    /**
+     * ic_resi_user主键
+     */
+    private String icResiUserId;
+
     /**
      * epmet用户主键
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
index 088f8431d5..dd632ca671 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
@@ -24,6 +24,11 @@ public class ChangeRelocationDTO implements Serializable {
      */
 	private String id;
 
+    /**
+     * ic_resi_user主键
+     */
+    private String icResiUserId;
+
     /**
      * 姓名
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
index 9ec9b5956d..d0be989687 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
@@ -18,6 +18,12 @@ public class IcMoveInListResultDTO implements Serializable {
      * 迁入Id
      */
     private String moveInId;
+
+    /**
+     * ic_resi_user主键
+     */
+    private String icResiUserId;
+
     /**
      * 网格ID
      */
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml
index 36a6f06002..f0e6b117b8 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml
@@ -28,6 +28,7 @@
         SELECT
         d.id,
         u.id AS userId,
+        u.id as icResiUserId,
         d.GRID_ID,
         u.`NAME`,
         d.ID_CARD,
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml
index 8bdf2847fe..0018ab91fb 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ChangeRelocationDao.xml
@@ -64,7 +64,8 @@
         r.CREATED_TIME,
         r.UPDATED_TIME,
         r.OUT_OF_TIME,
-        r.IC_USER_ID
+        r.IC_USER_ID,
+        r.IC_USER_ID as icResiUserId
         FROM
         pli_change_relocation r
         LEFT JOIN ic_resi_user u ON u.ID_CARD = r.ID_CARD
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
index 87e2d5f12b..03065d2e60 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
@@ -5,74 +5,74 @@
 
     <select id="selectMoveInList" resultType="com.epmet.dto.result.IcMoveInListResultDTO">
         SELECT
-            id moveInId,
-            grid_id gridId,
-            village_id villageId,
-            build_id buildId,
-            unit_id unitId,
-            home_id homeId,
-            name NAME,
-            is_welfare isWeifare,
-            is_check isCheck,
-            mobile mobile,
-            id_card idCard,
-            gender gender,
-            IF(gender='1','男',IF(gender='2','女','未知'))genderName,
-            age age,
-            in_time inTime,
-            in_reason inReason,
-            source_address_code sourceAddressCode,
-            source_address_path_code sourceAddressPathCode,
-            source_address sourceAddress,
-            address address,
-            move_number moveNumber,
-            householder_name householderName,
-            householder_relation householderRelation
-        FROM
-            ic_move_in_record
-        WHERE
-            del_flag = '0'
-            AND customer_id=#{customerId}
+            iru.ID as icResiUserId,
+            mir.id moveInId,
+            mir.grid_id gridId,
+            mir.village_id villageId,
+            mir.build_id buildId,
+            mir.unit_id unitId,
+            mir.home_id homeId,
+            mir.name NAME,
+            mir.is_welfare isWeifare,
+            mir.is_check isCheck,
+            mir.mobile mobile,
+            mir.id_card idCard,
+            mir.gender gender,
+            IF(mir.gender='1','男',IF(mir.gender='2','女','未知'))genderName,
+            mir.age age,
+            mir.in_time inTime,
+            mir.in_reason inReason,
+            mir.source_address_code sourceAddressCode,
+            mir.source_address_path_code sourceAddressPathCode,
+            mir.source_address sourceAddress,
+            mir.address address,
+            mir.move_number moveNumber,
+            mir.householder_name householderName,
+            mir.householder_relation householderRelation
+        FROM ic_move_in_record mir
+        left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0
+        WHERE  mir.del_flag = '0'
+        AND mir.customer_id=#{customerId}
         <if test="gridId != null and gridId != '' ">
-            AND grid_id = #{gridId}
+            AND mir.grid_id = #{gridId}
         </if>
         <if test="villageId != null and villageId != '' ">
-            AND village_id = #{villageId}
+            AND mir.village_id = #{villageId}
         </if>
         <if test="buildId != null and buildId != '' ">
-            AND build_id = #{buildId}
+            AND mir.build_id = #{buildId}
         </if>
         <if test="unitId != null and unitId != '' ">
-            AND unit_id = #{unitId}
+            AND mir.unit_id = #{unitId}
         </if>
         <if test="homeId != null and homeId != '' ">
-            AND home_id = #{homeId}
+            AND mir.home_id = #{homeId}
         </if>
         <if test="name != null and name != '' ">
-            AND `name` LIKE CONCAT('%', #{name}, '%')
+            AND mir.name LIKE CONCAT('%', #{name}, '%')
         </if>
         <if test="mobile != null and mobile != '' ">
-            AND mobile = #{mobile}
+            AND mir.mobile = #{mobile}
         </if>
         <if test="idCard != null and idCard != '' ">
-            AND id_card = #{idCard}
+            AND mir.id_card = #{idCard}
         </if>
         <if test="startTime != null and startTime != '' ">
-            AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[>=]]> #{startTime}
+            AND DATE_FORMAT(mir.in_time,"%Y-%m-%d") <![CDATA[>=]]> #{startTime}
         </if>
         <if test="endTime != null and endTime != '' ">
-            AND DATE_FORMAT(in_time,"%Y-%m-%d") <![CDATA[<=]]> #{endTime}
+            AND DATE_FORMAT(mir.in_time,"%Y-%m-%d") <![CDATA[<=]]> #{endTime}
         </if>
         <if test="isWeifare != null and isWeifare != '' ">
-            AND is_welfare = #{isWeifare}
+            AND mir.is_welfare = #{isWeifare}
         </if>
         <if test="moveInId != null and moveInId != '' ">
-            AND id = #{moveInId}
+            AND mir.id = #{moveInId}
         </if>
         <if test="agencyId != null and agencyId != '' ">
-            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
+            AND (mir.AGENCY_ID = #{agencyId} OR mir.PIDS LIKE CONCAT('%',#{agencyId},'%'))
         </if>
-        ORDER BY created_time DESC
+        ORDER BY mir.created_time DESC
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>