From f2ef904d6862a83204eaf09116e061b1c594d9f8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 17:26:08 +0800
Subject: [PATCH] change

---
 .../epmet/service/impl/IcMoveInRecordServiceImpl.java    | 2 ++
 .../service/impl/IcUserTransferRecordServiceImpl.java    | 9 +++++----
 2 files changed, 7 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 59dfc73bb2..504c022534 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
@@ -193,6 +193,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 entity.setId(resiDTO.getIcResiUserId());
                 icResiUserService.updateById(entity);
                 change.setOrigin("change");
+                change.setIcUserId(entity.getId());
                 icUserTransferRecordService.moveResi(change);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "1".equals(resiDTO.getStatus())) {
                 //4-2.本社区下游离状态居民【更新居民信息，生成变更记录、变更明细】
@@ -216,6 +217,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 entity.setPids(staffInfo.getAgencyPIds());
                 icResiUserService.insert(entity);
                 change.setOrigin("add");
+                change.setIcUserId(entity.getId());
                 icUserTransferRecordService.moveResi(change);
             }
         }
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 fe0165a261..6487476bb5 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
@@ -376,13 +376,13 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
             StringBuffer beforeName = new StringBuffer();
             beforeName.append(icResiUserOrgMsgResultDTO.getAgencyDTO().getOrganizationName()).append("-").append(icResiUserOrgMsgResultDTO.getGridDTO().getGridName()).append("-")
                     .append(icResiUserOrgMsgResultDTO.getNeighborHoodDTO().getNeighborHoodName()).append("-").append(icResiUserOrgMsgResultDTO.getBuildingDTO().getBuildingName()).append("-")
-                    .append(icResiUserOrgMsgResultDTO.getBuildingUnitDTO().getUnitName()).append("-").append(icResiUserOrgMsgResultDTO.getHouseDTO().getHouseName());
+                    .append(icResiUserOrgMsgResultDTO.getBuildingUnitDTO().getUnitName()).append("-").append(icResiUserOrgMsgResultDTO.getHouseDTO().getDoorName());
             changeRecordEntity.setBeforeChangeName(beforeName.toString());
             StringBuffer afterName = new StringBuffer();
             if ("in".equals(formDTO.getType())) {
                 afterName.append(result2.getData().getAgencyDTO().getOrganizationName()).append("-").append(result2.getData().getGridDTO().getGridName()).append("-")
                         .append(result2.getData().getNeighborHoodDTO().getNeighborHoodName()).append("-").append(result2.getData().getBuildingDTO().getBuildingName()).append("-")
-                        .append(result2.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result2.getData().getHouseDTO().getHouseName());
+                        .append(result2.getData().getBuildingUnitDTO().getUnitName()).append("-").append(result2.getData().getHouseDTO().getDoorName());
             }
             changeRecordEntity.setAfterChangeName(StringUtils.isEmpty(afterName.toString()) ? "-" : afterName.toString());
         }
@@ -448,8 +448,9 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
      */
     private Result<IcResiUserOrgMsgResultDTO> getNewHouseInfo(IcResiUserTransferFormDTO formDTO) {
         Result<IcResiUserOrgMsgResultDTO> result2 = new Result<>();
-        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) && "in".equals(formDTO.getType())) {
-            //迁出且类型为 迁出到本客户内的，才会查询新的房屋信息；迁出到其他的不查询
+        if ((IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin()))
+                && "in".equals(formDTO.getType())) {
+            //迁出/变动且类型为 迁出到本客户内的，才会查询新的房屋信息；迁出到其他的不查询
             IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO();
             orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId());
             orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId());