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] =?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

---
 .../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())) {