From cd9eaf8951cd325f70cd0b2cd2fc12ee1cfb2d34 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 14 Jun 2022 13:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?-=E6=B7=BB=E5=8A=A0=E8=B0=83=E5=8A=A8=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/IcResiUserConfirmSubmitDTO.java  |  2 ++
 .../epmet/controller/MyHomeController.java    |  4 ++-
 .../service/impl/IcResiUserServiceImpl.java   | 35 ++++++++++++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java
index 771733caab..ea119fbd80 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java
@@ -27,6 +27,8 @@ public class IcResiUserConfirmSubmitDTO implements Serializable {
      */
     private String customerId;
 
+    private String staffId;
+
     /**
      * 组织Id
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
index 7757c2bf8d..0e595cc96f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java
@@ -119,9 +119,11 @@ public class MyHomeController {
      * @return com.epmet.commons.tools.utils.Result
      */
     @PostMapping("addWorkMember")
-    public Result addWorkMember(@RequestBody IcResiUserConfirmSubmitDTO dto){
+    public Result addWorkMember(@LoginUser TokenDto tokenDto,@RequestBody IcResiUserConfirmSubmitDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
+        dto.setStaffId(tokenDto.getUserId());
         return icResiUserService.addWorkMember(dto);
     }
 
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 dc6a209be3..b8eadddcd3 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
@@ -2366,7 +2366,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), houseInfo.getCustomerId());
         if (null != userDTO && null != userDTO.getIdCard()) {
-            //覆盖原有的家庭成员信息
+            //覆盖原有的家庭成员信息,并且添加成员变更记录
             return updateOldMemberInfo(houseInfo.getCustomerId(),dto);
         }
 
@@ -2378,14 +2378,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     private Result updateOldMemberInfo(String customerId, IcResiUserConfirmSubmitDTO dto) {
         IcResiUserEntity userEntity = baseDao.selectResiUserEntityByIdCard(dto.getIdCard(), customerId);
-        userEntity.setCustomerId(dto.getCustomerId());
-        userEntity.setAgencyId(dto.getAgencyId());
-        userEntity.setPids(dto.getPids());
-        userEntity.setGridId(dto.getGridId());
-        userEntity.setVillageId(dto.getVillageId());
-        userEntity.setBuildId(dto.getBuildId());
-        userEntity.setUnitId(dto.getUnitId());
-        userEntity.setHomeId(dto.getHomeId());
+        //在添加调动记录的时候调整
+//        userEntity.setCustomerId(dto.getCustomerId());
+//        userEntity.setAgencyId(dto.getAgencyId());
+//        userEntity.setPids(dto.getPids());
+//        userEntity.setGridId(dto.getGridId());
+//        userEntity.setVillageId(dto.getVillageId());
+//        userEntity.setBuildId(dto.getBuildId());
+//        userEntity.setUnitId(dto.getUnitId());
+//        userEntity.setHomeId(dto.getHomeId());
 
         userEntity.setName(dto.getName());
         userEntity.setIdCard(dto.getIdCard());
@@ -2397,6 +2398,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         userEntity.setHjszd(dto.getHjszd());
         userEntity.setXjzd(dto.getXjzd());
         userEntity.setUpdatedTime(new java.util.Date());
+        //添加人员调动记录
+        IcResiUserTransferFormDTO formDTO = new IcResiUserTransferFormDTO();
+        formDTO.setIcUserId(userEntity.getId());
+        formDTO.setType("in");//客户内
+        formDTO.setNewAgencyId(dto.getAgencyId());
+        formDTO.setNewGridId(dto.getGridId());
+        formDTO.setNewNeighborHoodId(dto.getVillageId());
+        formDTO.setNewBuildingId(dto.getBuildId());
+        formDTO.setNewBuildingUnitId(dto.getUnitId());
+        formDTO.setNewHouseId(dto.getHomeId());
+        formDTO.setTransferTime(new java.util.Date());
+        formDTO.setRemark("更换房屋");
+        formDTO.setReason("更换房屋");
+        formDTO.setOrigin(IcResiUserConstant.CHANGE);
+        icUserTransferRecordService.add(formDTO);
+        //更新家庭成员信息
         baseDao.updateById(userEntity);
         return new Result().ok("新增成功");
     }