From 5ee569aea67c846b2746d70a600cff6ca63f02ba Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 May 2022 09:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9resiUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/IcResiUserController.java   | 2 +-
 .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 1068ec4de4..30c9a10bc2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -680,7 +680,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @param formDTO
      * @return
      * @LoginUser TokenDto tokenDto,
-     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
+     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列
      */
     @PostMapping("demandusers")
     public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) {
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 ba8f1870cb..ecb0cfc044 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
@@ -145,7 +145,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 && StringUtils.isNotBlank(formDTO.getIsReplace()) && !"0".equals(formDTO.getIsReplace()) && !"1".equals(formDTO.getIsReplace())) {
             throw new EpmetException(EpmetErrorCode.IC_MOVE_IN.getCode(), EpmetErrorCode.IC_MOVE_IN.getMsg());
         }
-
+        String resiUserId="";
         //4.勾选了补充居民信息的
         if ("1".equals(formDTO.getIsCheck())) {
             IcResiUserTransferFormDTO change = new IcResiUserTransferFormDTO();
@@ -167,6 +167,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
             if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
                     && "0".equals(resiDTO.getStatus()) && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
                     && "1".equals(formDTO.getIsReplace())) {
+                resiUserId=resiDTO.getIcResiUserId();
                 entity.setId(resiDTO.getIcResiUserId());
                 change.setOrigin("change");
                 change.setIcUserId(entity.getId());
@@ -175,6 +176,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 icResiUserService.updateById(entity);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "1".equals(resiDTO.getStatus())) {
                 //4-2.本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
+                resiUserId=resiDTO.getIcResiUserId();
                 entity.setId(resiDTO.getIcResiUserId());
                 change.setIcUserId(entity.getId());
                 change.setOrigin("in");
@@ -182,6 +184,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 icResiUserService.updateById(entity);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())) {
                 //4-3.非本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
+                resiUserId=resiDTO.getIcResiUserId();
                 entity.setId(resiDTO.getIcResiUserId());
                 entity.setAgencyId(staffInfo.getAgencyId());
                 entity.setPids(staffInfo.getAgencyPIds());
@@ -199,6 +202,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 change.setOrigin("add");
                 change.setIcUserId(entity.getId());
                 icUserTransferRecordService.moveResi(change);
+                resiUserId=entity.getId();
             }
         }
 
@@ -211,7 +215,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         //6.判断调用是否享受福利接口
         if("1".equals(formDTO.getIsWelfare())){
             ChangeWelfareDTO formDto = new ChangeWelfareDTO();
-            formDto.setUserId(resiDTO.getIcResiUserId());
+            formDto.setUserId(resiUserId);
             formDto.setName(formDTO.getName());
             formDto.setIdCard(formDTO.getIdCard());
             formDto.setMobile(formDTO.getMobile());