Merge branch 'dev_move_out_of' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_move_out_of

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;
 
     /**

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;
@@ -181,6 +182,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())
@@ -211,6 +214,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());