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

---
 .../com/epmet/dto/ChangeRelocationDTO.java    |  2 +
 .../com/epmet/dto/IcResiUserConfirmDTO.java   |  2 +
 .../ChangeRelocationController.java           | 20 +++++++
 .../service/ChangeRelocationService.java      | 10 ++++
 .../impl/ChangeRelocationServiceImpl.java     | 53 +++++++++++++++++++
 .../impl/IcResiUserConfirmServiceImpl.java    |  1 +
 6 files changed, 88 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
index 25b5dbf56b..088f8431d5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ChangeRelocationDTO.java
@@ -210,4 +210,6 @@ public class ChangeRelocationDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date transferTime;
+
+    private String isMoveOut;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java
index e0a297cd63..d8e37ceba2 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserConfirmDTO.java
@@ -221,4 +221,6 @@ public class IcResiUserConfirmDTO implements Serializable {
 
     private String moveOutDate;
 
+    private String isMoveOut;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
index 8066a87271..1b84302742 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/ChangeRelocationController.java
@@ -124,4 +124,24 @@ public class ChangeRelocationController {
         return new Result();
     }
 
+    /**
+     * 从家庭中移除
+     *
+     * @Param tokenDto
+     * @Param dto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/6/27 10:50
+     */
+    @NoRepeatSubmit
+    @PostMapping("moveOutHomeConfirm")
+    public Result moveOutHomeConfirm(@LoginUser TokenDto tokenDto, @RequestBody ChangeRelocationDTO dto){
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setStaffId(tokenDto.getUserId());
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        changeRelocationService.moveOutHomeConfirm(dto);
+        return new Result();
+    }
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java
index 1a54dba7c7..150fc05fa0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/ChangeRelocationService.java
@@ -95,4 +95,14 @@ public interface ChangeRelocationService extends BaseService<ChangeRelocationEnt
      * @Date 2022/6/27 10:52
      */
     void moveOutHome(ChangeRelocationDTO dto);
+
+    /**
+     * 从家庭中移除
+     *
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/27 10:52
+     */
+    void moveOutHomeConfirm(ChangeRelocationDTO dto);
 }
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 e7fcf36e0a..694cfbb153 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
@@ -44,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -279,6 +280,58 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         }
     }
 
+    /**
+     * 从家庭中移除
+     *
+     * @param dto
+     * @Param dto
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/6/27 10:52
+     */
+    @Override
+    public void moveOutHomeConfirm(ChangeRelocationDTO dto) {
+        if (NumConstant.ONE_STR.equals(dto.getIsMoveOut())) {
+            //需要迁至其他房屋，走变更流程
+            //获取居民信息
+            IcResiUserDTO userInfo = icResiUserService.get(dto.getIcUserId());
+            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());
+            formDTO.setType("in");
+            formDTO.setNewAgencyId(userInfo.getAgencyId());
+            formDTO.setNewGridId(dto.getGridId());
+            formDTO.setNewNeighborHoodId(dto.getVillageId());
+            formDTO.setNewBuildingId(dto.getBuildId());
+            formDTO.setNewBuildingUnitId(dto.getUnitId());
+            formDTO.setNewHouseId(dto.getHomeId());
+            formDTO.setTransferTime(dto.getTransferTime());
+            formDTO.setIdEdit(false);
+            formDTO.setCustomerId(dto.getCustomerId());
+            formDTO.setStaffId(dto.getStaffId());
+            icUserTransferRecordService.add(formDTO);
+        } else {
+            //不需要迁至其他房屋，直接变游离状态
+            dto.setType("out");
+            dto.setTransferTime(new Date());
+            dto.setAddress("其他");
+            dto.setReason("移除");
+            this.saveOutOfInfo(dto);
+        }
+    }
+
     public void editResiMq(String customerId, String userId) {
         //推送MQ事件
         IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
index 0ebe094de0..a0e90f7450 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
@@ -341,6 +341,7 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "驳回原因不能为空", "驳回原因不能为空");
             }
         }
+        formDTO.setOperationDescribe(formDTO.getIsMoveOut());
         baseDao.updateById(ConvertUtils.sourceToTarget(formDTO, IcResiUserConfirmEntity.class));
         //审核不通过，发送消息
         if (NumConstant.TWO_STR.equals(formDTO.getConfirmResult())) {

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

---
 .../com/epmet/service/impl/IcResiUserConfirmServiceImpl.java  | 4 +++-
 .../src/main/resources/mapper/IcResiUserDao.xml               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
index a0e90f7450..5fb27ad388 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
@@ -167,11 +167,13 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
         if (null != result) {
             LambdaQueryWrapper<IcResiUserConfirmEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(IcResiUserConfirmEntity::getIcResiUserId, dto.getIcResiUserId());
+            wrapper.eq(IcResiUserConfirmEntity::getHouseId, result.getHouseId());
             wrapper.in(IcResiUserConfirmEntity::getSubmitType, Arrays.asList("in", "out"));
             wrapper.orderByDesc(IcResiUserConfirmEntity::getCreatedTime);
             List<IcResiUserConfirmEntity> list = baseDao.selectList(wrapper);
             if (CollectionUtils.isNotEmpty(list)) {
-                result.setMoveOutStatus(list.get(NumConstant.ZERO).getConfirmResult());
+                result.setMoveOutStatus(NumConstant.ONE_STR.equals(list.get(NumConstant.ZERO).getConfirmResult())?
+                        NumConstant.THREE_STR:list.get(NumConstant.ZERO).getConfirmResult());
             } else {
                 result.setMoveOutStatus(NumConstant.THREE_STR);
             }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 57f23f9898..32bcc084e5 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1099,9 +1099,11 @@
 			mz,
 			HJSZD,
 			yhzgx,
-			XJZD
+			XJZD,
+			HOME_ID AS houseId
     from ic_resi_user
     where DEL_FLAG='0'
+            and Status='0'
 		  and id=#{icResiUserId}
     </select>
     <select id="moveOutMember" resultType="com.epmet.dto.form.MoveOutMemberFormDTO">

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 3/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=9C=80=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>

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

---
 .../impl/ChangeRelocationServiceImpl.java      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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 361b8842a8..a7c985599e 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
@@ -10,6 +10,8 @@ import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
+import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -32,10 +34,7 @@ import com.epmet.entity.ChangeRelocationEntity;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.redis.ChangeRelocationRedis;
-import com.epmet.service.ChangeRelocationService;
-import com.epmet.service.ChangeWelfareService;
-import com.epmet.service.IcResiUserService;
-import com.epmet.service.IcUserTransferRecordService;
+import com.epmet.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +76,8 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
     private IcResiUserService icResiUserService;
     @Resource
     private IcUserTransferRecordService icUserTransferRecordService;
+    @Resource
+    private IcResiUserConfirmService icResiUserConfirmService;
 
     @Override
     public PageData<ChangeRelocationDTO> page(Map<String, Object> params) {
@@ -324,6 +325,15 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
             icResiUserService.updateById(uerEntity);
         } else {
             //不需要迁至其他房屋，直接变游离状态
+            IcResiUserEntity userEntity = icResiUserService.selectById(dto.getIcUserId());
+            //获取房屋信息
+            HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(dto.getCustomerId(), userEntity.getHomeId());
+            if (null == houseInfo) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
+            }
+            dto.setOldDept(houseInfo.getGridName());
+            dto.setOldAddress(houseInfo.getAllName());
+            dto.setOldHome(houseInfo.getDoorName());
             dto.setType("out");
             dto.setOutOfTime(new Date());
             dto.setAddress("其他");