From 4bda9cc7829baab33d7289f3c393ef735d90bab3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 20 Jan 2022 09:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E5=92=8C=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcUserChangeRecordServiceImpl.java   |  2 +-
 .../main/resources/mapper/IcResiUserDao.xml   | 73 ++++++++++---------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
index 7a882e807e..4241e3428b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java
@@ -180,7 +180,7 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         IcUserChangeDetailedEntity detailed = null;
         //存放工作人员姓名
         Map<String, String> hash = new HashMap<>();
-        //2.分批处理客户下居民数据
+        //2.分批处理客户下居民数据【只查询在变更记录表不存在新增节点的居民】
         int pageNo = NumConstant.ONE;
         List<Map<String, String>> icUserList = new ArrayList<>();
         do {
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 99031d8f5e..5ef3c54d15 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -576,43 +576,46 @@
 
     <select id="getIcUserList" resultType="java.util.Map">
         SELECT
-            id ID,
-            customer_id CUSTOMER_ID,
-            agency_id AGENCY_ID,
-            pids PIDS,
-            grid_id GRID_ID,
-            village_id VILLAGE_ID,
-            build_id BUILD_ID,
-            unit_id UNIT_ID,
-            home_id HOME_ID,
-            name NAME,
-            created_by CREATED_BY,
-            date_format(created_time, '%Y-%m-%d %h:%i:%s') CREATED_TIME,
-            IFNULL(is_kc,'0') IS_KC,
-            IFNULL(is_cj,'0') IS_CJ,
-            IFNULL(is_ylfn,'0') IS_YLFN,
-            IFNULL(is_sn,'0') IS_SN,
-            IFNULL(is_special,'0') IS_SPECIAL,
-            IFNULL(is_volunteer,'0') IS_VOLUNTEER,
-            IFNULL(is_unemployed,'0') IS_UNEMPLOYED,
-            IFNULL(is_mb,'0') IS_MB,
-            IFNULL(is_sz,'0') IS_SZ,
-            IFNULL(is_sd,'0') IS_SD,
-            IFNULL(is_veterans,'0') IS_VETERANS,
-            IFNULL(is_ensure_house,'0') IS_ENSURE_HOUSE,
-            IFNULL(is_party,'0') IS_PARTY,
-            IFNULL(is_old_people,'0') IS_OLD_PEOPLE,
-            IFNULL(is_xfry,'0')IS_XFRY,
-            IFNULL(is_united_front,'0') IS_UNITED_FRONT,
-            IFNULL(is_db,'0') IS_DB,
-            IFNULL(is_dbh,'0') IS_DBH
+            iru.id ID,
+            iru.customer_id CUSTOMER_ID,
+            iru.agency_id AGENCY_ID,
+            iru.pids PIDS,
+            iru.grid_id GRID_ID,
+            iru.village_id VILLAGE_ID,
+            iru.build_id BUILD_ID,
+            iru.unit_id UNIT_ID,
+            iru.home_id HOME_ID,
+            iru.name NAME,
+            iru.created_by CREATED_BY,
+            date_format(iru.created_time, '%Y-%m-%d %h:%i:%s') CREATED_TIME,
+            IFNULL(iru.is_kc,'0') IS_KC,
+            IFNULL(iru.is_cj,'0') IS_CJ,
+            IFNULL(iru.is_ylfn,'0') IS_YLFN,
+            IFNULL(iru.is_sn,'0') IS_SN,
+            IFNULL(iru.is_special,'0') IS_SPECIAL,
+            IFNULL(iru.is_volunteer,'0') IS_VOLUNTEER,
+            IFNULL(iru.is_unemployed,'0') IS_UNEMPLOYED,
+            IFNULL(iru.is_mb,'0') IS_MB,
+            IFNULL(iru.is_sz,'0') IS_SZ,
+            IFNULL(iru.is_sd,'0') IS_SD,
+            IFNULL(iru.is_veterans,'0') IS_VETERANS,
+            IFNULL(iru.is_ensure_house,'0') IS_ENSURE_HOUSE,
+            IFNULL(iru.is_party,'0') IS_PARTY,
+            IFNULL(iru.is_old_people,'0') IS_OLD_PEOPLE,
+            IFNULL(iru.is_xfry,'0')IS_XFRY,
+            IFNULL(iru.is_united_front,'0') IS_UNITED_FRONT,
+            IFNULL(iru.is_db,'0') IS_DB,
+            IFNULL(iru.is_dbh,'0') IS_DBH
         FROM
-            ic_resi_user
+            ic_resi_user iru
+        <!-- 只查询在变更记录表不存在新增节点的居民 -->
+        LEFT JOIN ic_user_change_record iucr ON iru.id = iucr.ic_user_id AND iucr.type = 'add'
         WHERE
-            del_flag = '0'
-        AND `status` = '0'
-        AND customer_id = #{customerId}
-        ORDER BY created_time ASC
+            iucr.ic_user_id IS NULL
+        AND iru.del_flag = '0'
+        AND iru.`status` = '0'
+        AND iru.customer_id = #{customerId}
+        ORDER BY iru.created_time ASC
     </select>
 
 </mapper>