From 80c1a060390a2f8a8f76f0f9f5aa4ae28f8892aa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 9 May 2022 22:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=8F=98=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9C=89=E8=BF=81=E5=85=A5=E5=88=B0=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96ic=5Fresi=5Fuser.status=3D'1'=EF=BC=9BsubStatus=3D'11'?=
 =?UTF-8?q?;=E5=85=A5=E5=8F=82=E5=A2=9E=E5=8A=A0reason.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/IcResiUserTransferFormDTO.java   | 5 +++++
 .../epmet/service/impl/IcUserTransferRecordServiceImpl.java  | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java
index 7b840a83aa..cbd15606be 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserTransferFormDTO.java
@@ -63,6 +63,11 @@ public class IcResiUserTransferFormDTO implements Serializable {
 	 */
 	private String remark;
 
+	/**
+	 * 原因（迁入原因/迁出原因等）
+	 */
+	private String reason;
+
 	//标识，默认为true,为false表示是居民信息修改调用了人员调动的接口，只需要生成调动记录，不涉及修改基础信息
 	private Boolean idEdit = true;
 	//token中信息
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 0cceb4b513..c6b28ead02 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
@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
@@ -28,7 +29,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcUserTransferRecordDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
-import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.IcResiUserOrgMsgFormDTO;
 import com.epmet.dto.form.IcResiUserTransferFormDTO;
@@ -129,6 +129,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
             if ("out".equals(formDTO.getType())) {
                 //4-1.转到客户外修改基础信息表人员信息状态
                 userEntity.setStatus("1");
+                //用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡
+                userEntity.setSubStatus(IcResiUserSubStatusEnum.MOVE_OUT.getSubStatus());
             } else {
                 //4-2.客户内部流转修改所属各维度信息
                 userEntity.setAgencyId(formDTO.getNewAgencyId());
@@ -172,6 +174,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());
         icUserChangeRecordService.insert(changeRecordEntity);
         //6-2.变更明细【类别明细迁出组织的-1，迁入组织的1】