From aea88e3bc95243aa36e96cb062096ab7ea74d0ea Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 11 May 2022 15:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcMoveInRecordServiceImpl.java    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
index 90db2141bc..7dfba6301d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
@@ -161,7 +161,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         //2.校验是否允许迁入
         SyncResiResDTO resiDTO = icResiUserService.checkUser(formDTO.getCustomerId(), formDTO.getIdCard(), staffInfo.getAgencyId());
         if (!resiDTO.getMoveInstatus()) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前居民不允许迁入");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请联系" + resiDTO.getResiAgencyName() + "迁出该居民后操作");
         }
 
         //3.判断是否需要更新居民信息
@@ -185,17 +185,20 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
             change.setReason(formDTO.getInReason());
             change.setCustomerId(formDTO.getCustomerId());
             change.setStaffId(formDTO.getUserId());
-            change.setOrigin("in");
             IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiUserEntity.class);
-            //4-1.本社区下正常状态居民【只更新居民信息，不生成变更记录、变更明细】
-            if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "0".equals(resiDTO.getStatus())) {
+            //4-1.本社区下正常状态居民且房屋不一样【只更新居民信息，生成变更记录，不生成变更明细】
+            if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
+                    && "0".equals(resiDTO.getStatus()) && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())) {
                 entity.setId(resiDTO.getIcResiUserId());
                 icResiUserService.updateById(entity);
+                change.setOrigin("change");
+                icUserTransferRecordService.moveResi(change);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "1".equals(resiDTO.getStatus())) {
                 //4-2.本社区下游离状态居民【更新居民信息，生成变更记录、变更明细】
                 entity.setId(resiDTO.getIcResiUserId());
                 icResiUserService.updateById(entity);
                 change.setIcUserId(entity.getId());
+                change.setOrigin("in");
                 icUserTransferRecordService.moveResi(change);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())) {
                 //4-3.非本社区下游离状态居民【更新居民信息，生成变更记录、变更明细】
@@ -204,12 +207,15 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 entity.setPids(staffInfo.getAgencyPIds());
                 icResiUserService.updateById(entity);
                 change.setIcUserId(entity.getId());
+                change.setOrigin("in");
                 icUserTransferRecordService.moveResi(change);
             } else if (StringUtils.isBlank(resiDTO.getResiAgencyId())) {
                 //4-4.客户下不存在的居民(新数据)【新增居民信息，不生成变更记录、变更明细(因为十八类默认都是否)】
                 entity.setAgencyId(staffInfo.getAgencyId());
                 entity.setPids(staffInfo.getAgencyPIds());
                 icResiUserService.insert(entity);
+                change.setOrigin("add");
+                icUserTransferRecordService.moveResi(change);
             }
         }