From 03a1c8805771a30d0ecbe4177d073aff6573ce97 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 18 May 2022 10:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=B4=E5=83=8F=E7=9A=84?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E5=B1=85=E6=B0=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/entity/IcResiUserEntity.java     | 5 +++++
 .../src/main/java/com/epmet/service/IcResiUserService.java   | 2 ++
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java   | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
index f17a1b8852..5b70e7a653 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
@@ -220,6 +220,11 @@ public class IcResiUserEntity extends BaseEpmetEntity {
 	 */
 	private String isTenant;
 
+	/**
+	 * 是否流动人口【是:1 否:0】
+	 */
+	private String isFloating;
+
     /**
      * 文化程度【字典表】
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
index b9a9592509..d53232e75d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -301,6 +301,8 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
 
     /**
      * 租客房东根据身份证更新头像
+     * 5.17更新头像的同时更新居民状态是租客
+     * 5.18同时更新居民状态是流动
      *
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result
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 75a30d6a97..8cb037fa4e 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
@@ -1763,12 +1763,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 IcResiUserEntity entity = new IcResiUserEntity();
                 entity.setId(resiUserId);
                 entity.setIsTenant(NumConstant.ONE_STR);
+                entity.setIsFloating(NumConstant.ONE_STR);
                 updateById(entity);
             }
         } else if (NumConstant.ONE_STR.equals(formDTO.getType())) {
             // 如果是新增的租客，需要新增一条信息，不存在的房东就不管了
             IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class);
             entity.setIsTenant(NumConstant.ONE_STR);
+            entity.setIsFloating(NumConstant.ONE_STR);
             insert(entity);
             resiUserId = entity.getId();
             // 变更记录表和变更记录明细表新增数据