From 4c11daab161ebf96c921be3b39e77b45083ea9c1 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Jul 2022 10:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=98=E6=9B=B4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ResidentByIdCardResultDTO.java |  2 ++
 .../main/resources/mapper/CaResidentDao.xml   |  1 +
 .../com/epmet/dto/form/BindHomeFormDTO.java   |  2 ++
 .../controller/IcResiUserController.java      |  1 +
 .../service/impl/IcResiUserServiceImpl.java   | 19 +++++++++++++++++++
 5 files changed, 25 insertions(+)

diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java
index 195d499f25..ca45456541 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java
@@ -10,6 +10,8 @@ public class ResidentByIdCardResultDTO implements Serializable {
 
     private static final long serialVersionUID = 3809219691923066512L;
 
+    private Long residentId;
+
     /**
      * 人口性质
      */
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
index b720dacb29..ff8de34041 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
@@ -159,6 +159,7 @@
     <select id="getResidentDetailByIdCard"
             resultType="com.epmet.opendata.dto.result.ResidentByIdCardResultDTO">
         SELECT
+            resident_id
             resident_property,
             resident_type,
             id_type,
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java
index 767dcf1231..7256b32f3f 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java
@@ -26,4 +26,6 @@ public class BindHomeFormDTO implements Serializable {
      * 用户id
      */
     private String customerId;
+
+    private String userId;
 }
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 fc6dce18f9..c9c3747c01 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
@@ -1183,6 +1183,7 @@ public class IcResiUserController implements ResultDataResolver {
     public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) {
         ValidatorUtils.validateEntity(form);
         form.setCustomerId(tokenDto.getCustomerId());
+        form.setUserId(tokenDto.getUserId());
         icResiUserService.bindHome(form);
         return new Result();
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index f6a476c64e..7dbb773630 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2827,6 +2827,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if(houseInfo == null){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
         }
+        // 变更记录
+        IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
         // 将人的信息放入ic_resi_user对象中
         IcResiUserEntity entity = new IcResiUserEntity();
         entity.setCustomerId(form.getCustomerId());
@@ -2863,18 +2865,35 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             HouseAgencyInfoResultDTO data = resultDTOResult.getData();
             entity.setGridId(data.getGridId());
             entity.setPids(data.getPids() + ":" + data.getAgencyId());
+            formDTO.setNewGridId(data.getGridId());
         } else {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整");
         }
         SaveCaResidentUserFormDTO saveForm = new SaveCaResidentUserFormDTO();
         saveForm.setHomeId(form.getHomeId());
         saveForm.setIdCard(form.getIdCard());
+
+        // 添加变更记录
+        formDTO.setIcUserId(residentDetailByIdCard.getResidentId().toString());
+        formDTO.setType("in");
+        formDTO.setNewAgencyId(houseInfo.getAgencyId());
+        formDTO.setNewNeighborHoodId(houseInfo.getNeighborHoodId());
+        formDTO.setNewBuildingId(houseInfo.getBuildingId());
+        formDTO.setNewBuildingUnitId(houseInfo.getBuildingUnitId());
+        formDTO.setNewHouseId(houseInfo.getHomeId());
+        formDTO.setTransferTime(new java.util.Date());
+        formDTO.setCustomerId(form.getCustomerId());
+        formDTO.setStaffId(form.getUserId());
+
         if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
            String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
            baseDao.updateIcResiUserByIdCard(entity);
            saveForm.setIcResiUserId(id);
         } else {
             baseDao.insert(entity);
+            // 变更记录
+            icUserTransferRecordService.add(formDTO);
+
             String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
             saveForm.setIcResiUserId(id);
         }