From 7e7c1a8be5fe55fd8a263a7fe671d1908281ff03 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 18:00:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=81=E5=85=A5=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=B0=86=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?-=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
index 30a66373c3..02f0ea2fb0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
@@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
+import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@@ -186,6 +187,8 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
             change.setCustomerId(formDTO.getCustomerId());
             change.setStaffId(formDTO.getUserId());
             IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiUserEntity.class);
+            //状态改为0正常
+            entity.setStatus(NumConstant.ZERO_STR);
             //4-1.本社区下正常状态居民且房屋不一样并选择了更新【只更新居民信息，生成变更记录，不生成变更明细】
             if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
                     && "0".equals(resiDTO.getStatus()) && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
@@ -216,6 +219,8 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                 //4-4.客户下不存在的居民(新数据)【新增居民信息，不生成变更记录、变更明细(因为十八类默认都是否)】
                 entity.setAgencyId(staffInfo.getAgencyId());
                 entity.setPids(staffInfo.getAgencyPIds());
+                //迁入管理-新增的居民，存储03
+                entity.setSubStatus(IcResiUserSubStatusEnum.MOVE_IN.getSubStatus());
                 icResiUserService.insert(entity);
                 change.setOrigin("add");
                 change.setIcUserId(entity.getId());

From 0a09729c4435cb3fc3b5cc3fa3bd37f4e72c05a9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 18:02:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?ss=E5=85=88=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
index 10b926ba35..e7effcd6f7 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
@@ -93,7 +93,7 @@ public class IcUserChangeRecordDTO implements Serializable {
     /**
      * 变更时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date changeTime;
 
     /**
@@ -125,7 +125,7 @@ public class IcUserChangeRecordDTO implements Serializable {
      * 创建时间 
      * 调整时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date createdTime;
 
     /**