From 246ef5382c71a05af44aa64c3ae4d964f7feb2ad Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 11:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeDeathServiceImpl.java     | 16 +++++++++++-----
 .../impl/ChangeRelocationServiceImpl.java        |  6 ++++--
 .../impl/IcUserTransferRecordServiceImpl.java    |  4 ++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
index 4b098f8ffb..15f9cfcbab 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -141,22 +143,26 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         //更新epmet用户状态
         IcResiUserEntity userEntity = new IcResiUserEntity();
         userEntity.setId(dto.getUserId());
-        userEntity.setStatus("2");//死亡
-        userEntity.setSubStatus("21");//死亡
+        // 用户状态【0:正常;1:迁出;2:注销】
+        userEntity.setStatus(NumConstant.TWO_STR);
+        userEntity.setSubStatus(IcResiUserSubStatusEnum.DIED.getSubStatus());//死亡
         icResiUserService.updateById(userEntity);
+
         //变更主表、变更明细表
         IcResiUserTransferFormDTO icResiUserTransferFormDTO=new IcResiUserTransferFormDTO();
         icResiUserTransferFormDTO.setIcUserId(dto.getUserId());
+        //死亡相当于迁出至客户外，赋值out
         icResiUserTransferFormDTO.setType("out");
         icResiUserTransferFormDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         icResiUserTransferFormDTO.setStaffId(dto.getStaffId());
-        //死亡日期即为取当前时间，视作变更时间 todo 待确认
+        //死亡日期
         icResiUserTransferFormDTO.setTransferTime(dto.getDeathDate());
-        // icResiUserTransferFormDTO.setMoveType(IcResiUserConstant.DIED);
+        //死亡
         icResiUserTransferFormDTO.setOrigin(IcResiUserConstant.DIED);
         //死亡原因
-        icResiUserTransferFormDTO.setReason(dto.getJoinReason());
+        icResiUserTransferFormDTO.setReason(StringUtils.isNotBlank(dto.getJoinReason()) ? dto.getJoinReason() : "死亡登记");
         SpringContextUtils.getBean(IcUserTransferRecordService.class).moveResi(icResiUserTransferFormDTO);
+
         //推送MQ事件
         changeRelocationServiceImpl.editResiMq(formDTO.getCustomerId(), dto.getUserId());
         return new Result();
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 e3ce0a45f9..13e4f2dac5 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -190,7 +191,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         //更新epmet用户状态
         IcResiUserEntity userEntity = new IcResiUserEntity();
         userEntity.setId(dto.getIcUserId());
-        userEntity.setStatus("1");//转出（迁出）
+        userEntity.setStatus(NumConstant.ONE_STR);//转出（迁出）
         userEntity.setSubStatus(IcResiUserSubStatusEnum.MOVE_OUT.getSubStatus());//迁出
         icResiUserService.updateById(userEntity);
         //插入一条调动（迁出）记录、变更主表、变更明细表
@@ -201,8 +202,9 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
         icResiUserTransferFormDTO.setNewBuildingId(dto.getBuildId());
         icResiUserTransferFormDTO.setNewBuildingUnitId(dto.getUnitId());
         icResiUserTransferFormDTO.setNewHouseId(dto.getHomeId());
-        // icResiUserTransferFormDTO.setMoveType(IcResiUserConstant.OUT);
+        //迁出
         icResiUserTransferFormDTO.setOrigin(IcResiUserConstant.OUT);
+        icResiUserTransferFormDTO.setReason(StringUtils.isNotBlank(dto.getReason()) ? dto.getReason() : "迁出登记");
         SpringContextUtils.getBean(IcUserTransferRecordService.class).moveResi(icResiUserTransferFormDTO);
         //推送MQ事件
         editResiMq(dto.getCustomerId(), dto.getIcUserId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 4e66a174a1..86f8bc8f2d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -161,7 +161,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         changeRecordEntity.setAfterChangeName(StringUtils.isEmpty(afterName.toString()) ? "-" : afterName.toString());
         changeRecordEntity.setChangeTime(formDTO.getTransferTime());
         changeRecordEntity.setReason(formDTO.getReason());
-        changeRecordEntity.setRemark(formDTO.getRemark());
+        changeRecordEntity.setRemark(StringUtils.isNotBlank(formDTO.getRemark()) ? formDTO.getRemark() : "调动居民");
         icUserChangeRecordService.insert(changeRecordEntity);
         //6-2.变更明细【类别明细迁出组织的-1，迁入组织的1】
         IcResiCategoryStatsConfigDTO dto = new IcResiCategoryStatsConfigDTO();
@@ -338,7 +338,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
 
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();
-        //5.生成调动记录:  只有迁出的才生成
+        //5.生成调动记录:  只有迁出的才生成居民调动记录表ic_user_transfer_record记录
         if(IcResiUserConstant.OUT.equals(formDTO.getOrigin())){
             IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData());
             insert(recordEntity);