From 215ce3824a993a466bfe5a44bc5d19ebfb271a58 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 13:07:08 +0800
Subject: [PATCH] checkUser

---
 .../java/com/epmet/dto/result/SyncResiResDTO.java    |  3 +++
 .../epmet/service/IcUserTransferRecordService.java   | 12 +++++++++---
 .../epmet/service/impl/IcResiUserServiceImpl.java    |  9 ++++++---
 .../impl/IcUserTransferRecordServiceImpl.java        |  1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
index b93590bce9..af515bf87e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/SyncResiResDTO.java
@@ -52,6 +52,9 @@ public class SyncResiResDTO implements Serializable {
      * 身份证号已存在的居民，返回其房屋id
      */
     private String resiHomeId;
+    /**
+     * 用户状态【0:正常;1:迁出;2:注销】
+     */
     private String status;
     private String icResiUserId;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
index 4caf8570ba..2930a1f5e9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcUserTransferRecordService.java
@@ -35,10 +35,16 @@ public interface IcUserTransferRecordService extends BaseService<IcUserTransferR
      **/
     void add(IcResiUserTransferFormDTO formDTO);
 
+
     /**
-     * 迁出管理：新增迁出人员时，插入调动记录，插入变更主表，明细表
-     * 死亡管理：新增死亡人员时，插入变更主表，明细表
-     * 迁入、出生也调用此方法
+     * origin：变动：change; 迁出：out;死亡：died; 出生birth; 迁入：in
+     * 迁出管理：新增迁出人员时：插入调动记录，插入变更主表（操作类型是调动），明细表（原房屋-1）。与原来变动类似，只是选择的迁入至的新房屋类别分析不再+1，
+     * 死亡管理：新增死亡人员时：插入变更主表（操作类型是注销），明细表（原房屋-1）。
+     * 迁入：前提：如果勾选了补充居民信息
+     * 1、不存在居民：新增居民：插入变更记录（操作类型是新增）、变更明细（实际不会有值，因为默认18类都是否）；
+     * 2、本社区下的居民（正常迁出）只要房屋变更了：插入变更主表（操作类型是？todo），明细表
+     * 出生：
+     *
      * @param formDTO
      */
     void moveResi(IcResiUserTransferFormDTO formDTO);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index f2e3a26a9b..99a68899bb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1819,20 +1819,23 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             return resiResDTO;
         }
         //当前客户下，存在同身份证号的居民
+        if (NumConstant.TWO_STR.equals(icResiUserDTO.getStatus())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前居民状态2：注销", "当前身份证号对应居民已注销");
+        }
+        //用户状态：0:正常;1:迁出;可以继续执行
         resiResDTO.setIcResiUserId(icResiUserDTO.getId());
         resiResDTO.setStatus(icResiUserDTO.getStatus());
         resiResDTO.setResiAgencyId(icResiUserDTO.getAgencyId());
         resiResDTO.setResiHomeId(icResiUserDTO.getHomeId());
-        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(resiResDTO.getResiAgencyId());
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(icResiUserDTO.getAgencyId());
         if (null == agencyInfo) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询组织信息异常", EpmetErrorCode.SERVER_ERROR.getMsg());
         }
         resiResDTO.setResiAgencyName(agencyInfo.getOrganizationName());
         // 1.判断是否本社区居民，是的在判断是正常还是游离，正常的判断房屋跟之前是否一样，不一样的给提示是否更新，一样的直接更新居民信息，生成迁入记录，游离的直接更新居民信息，生成迁入记录
-        // 1.留给调用者去判断；
-
         // 2.判断不是本社区居民的，在判断是正常还是游离，正常的直接停止程序操作，游离的直接更新居民信息，生成迁入记录；
         if (!icResiUserDTO.getAgencyId().equals(agencyId) && !NumConstant.ONE_STR.equals(icResiUserDTO.getStatus())) {
+            //不是本社区内的居民且状态正常的需要先联系居民现在所在的社区进行迁出操作；
             resiResDTO.setMoveInstatus(false);
         }
         return resiResDTO;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 86f8bc8f2d..daa7b0f14b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -131,6 +131,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
 
         //5.生成调动记录
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        //只有迁出到本客户内其他房屋的才会有newXXX信息。
         IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData());
         insert(recordEntity);