From 959f8f1e392143fc409714510e3244749593891f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 7 Jul 2022 17:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=AE=A1=E6=A0=B8=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ConfirmListResultDTO.java      |  1 +
 .../impl/ChangeRelocationServiceImpl.java     | 20 +++++++++----------
 .../resources/mapper/IcResiUserConfirmDao.xml |  3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java
index f9c131d7b5..7871653ae7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ConfirmListResultDTO.java
@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 @Data
 public class ConfirmListResultDTO {
     private String id;
+    private String agencyId;
     private String name;
     private String gender;
     private String mobile;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
index 694cfbb153..361b8842a8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java
@@ -298,15 +298,6 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
             if (null == userInfo) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民信息不存在", "居民信息不存在");
             }
-            //更改房屋
-            IcResiUserEntity uerEntity = new IcResiUserEntity();
-            uerEntity.setId(dto.getIcUserId());
-            uerEntity.setGridId(dto.getGridId());
-            uerEntity.setVillageId(dto.getVillageId());
-            uerEntity.setBuildId(dto.getBuildId());
-            uerEntity.setUnitId(dto.getUnitId());
-            uerEntity.setHomeId(dto.getHomeId());
-            icResiUserService.updateById(uerEntity);
             //组织内走变更流程
             IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
             formDTO.setIcUserId(dto.getIcUserId());
@@ -322,10 +313,19 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
             formDTO.setCustomerId(dto.getCustomerId());
             formDTO.setStaffId(dto.getStaffId());
             icUserTransferRecordService.add(formDTO);
+            //更改房屋
+            IcResiUserEntity uerEntity = new IcResiUserEntity();
+            uerEntity.setId(dto.getIcUserId());
+            uerEntity.setGridId(dto.getGridId());
+            uerEntity.setVillageId(dto.getVillageId());
+            uerEntity.setBuildId(dto.getBuildId());
+            uerEntity.setUnitId(dto.getUnitId());
+            uerEntity.setHomeId(dto.getHomeId());
+            icResiUserService.updateById(uerEntity);
         } else {
             //不需要迁至其他房屋，直接变游离状态
             dto.setType("out");
-            dto.setTransferTime(new Date());
+            dto.setOutOfTime(new Date());
             dto.setAddress("其他");
             dto.setReason("移除");
             this.saveOutOfInfo(dto);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml
index b85e79003a..515384e843 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml
@@ -62,6 +62,7 @@
     <select id="getConfirmList" resultType="com.epmet.dto.result.ConfirmListResultDTO">
         SELECT
             a.ID,
+            a.AGENCY_ID,
             b.`NAME`,
             b.GENDER,
             b.ID_CARD,
@@ -81,7 +82,7 @@
         WHERE
             a.DEL_FLAG = 0
             AND a.SUBMIT_TYPE IN ( 'in', 'out' )
-            AND a.AGENCY_ID = #{agencyId}
+            AND (a.AGENCY_ID = #{agencyId} OR a.PIDS LIKE concat( '%', #{agencyId}, '%' ))
             <if test="null != name and name.trim() != ''">
                 AND b.NAME LIKE CONCAT('%',#{name},'%')
             </if>