From c30d869f5e5effb3d3136734a2a6bde0d1fb2447 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 15:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9moveResi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/constant/IcResiUserConstant.java    |  4 ++--
 .../dto/form/IcResiUserTransferFormDTO.java   |  3 ++-
 .../service/impl/IcResiUserServiceImpl.java   |  2 +-
 .../impl/IcUserTransferRecordServiceImpl.java | 20 ++++++++++++-------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java
index e5817de8cf..95a4b56fa5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java
@@ -17,11 +17,11 @@ public interface IcResiUserConstant {
 	String USER_TYPE_IMPORT="import";
 
 
-	// origin:变动：change; 迁出：out;    死亡：died; 出生birth; 迁入：in
+	// origin:变动：change; 迁出：out;    死亡：died; 出生birth; 迁入：in; 新增：add
 	String CHANGE = "change";
 	String OUT = "out";
 	String DIED = "died";
 	String BIRTH = "birth";
 	String IN = "in";
-
+	String ADD ="add";
 }
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 5eb03853ff..b3733abce3 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
@@ -86,8 +86,9 @@ public class IcResiUserTransferFormDTO implements Serializable {
 	 * 变动：change;
 	 * 迁出：out;
 	 * 死亡：died;
-	 * 出生birth;
+	 * //出生:birth;废弃
 	 * 迁入：in
+	 * 新增：add
 	 */
 	private String origin;
 }
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 99a68899bb..54a418d2de 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
@@ -1835,7 +1835,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // 1.判断是否本社区居民，是的在判断是正常还是游离，正常的判断房屋跟之前是否一样，不一样的给提示是否更新，一样的直接更新居民信息，生成迁入记录，游离的直接更新居民信息，生成迁入记录
         // 2.判断不是本社区居民的，在判断是正常还是游离，正常的直接停止程序操作，游离的直接更新居民信息，生成迁入记录；
         if (!icResiUserDTO.getAgencyId().equals(agencyId) && !NumConstant.ONE_STR.equals(icResiUserDTO.getStatus())) {
-            //不是本社区内的居民且状态正常的需要先联系居民现在所在的社区进行迁出操作；
+            //不是本社区内的居民且状态不是迁出的需要先联系居民现在所在的社区进行迁出操作；
             resiResDTO.setMoveInstatus(false);
         }
         return resiResDTO;
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 daa7b0f14b..904b4eccff 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
@@ -204,6 +204,9 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         recordEntity.setTransferTime(formDTO.getTransferTime());
         recordEntity.setRemark(formDTO.getRemark());
         if ("in".equals(formDTO.getType())) {
+            //变动：迁出类型为本客户内的房子
+            //迁出：迁出类型为本客户内的房子
+            //迁入：同社区的居民，状态正常，改变了房屋  目前这三种情况 type="in";
             recordEntity.setNewCustomerId(resiUserDTO.getCustomerId());
             recordEntity.setNewAgencyId(formDTO.getNewAgencyId());
             recordEntity.setNewAgencyName(result2.getAgencyDTO().getOrganizationName());
@@ -278,7 +281,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
                     list.add(outEntity);
                 }
                 //原来的变动，并且是迁入到同客户内走下面的流程
-                if ("in".equals(formDTO.getType()) && IcResiUserConstant.CHANGE.equals(origin)) {
+                if ("in".equals(formDTO.getType()) && IcResiUserConstant.CHANGE.equals(origin)) {//todo
                     inEntity = new IcUserChangeDetailedEntity();
                     inEntity.setCustomerId(formDTO.getCustomerId());
                     inEntity.setIcUserChangeRecordId(icUserChangeRecordId);
@@ -295,7 +298,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
                     inEntity.setFieldName(cf.getColumnName());
                     inEntity.setValue(1);
                     list.add(inEntity);
-                }else if(IcResiUserConstant.IN.equals(origin)||IcResiUserConstant.BIRTH.equals(origin)){
+                }else if(IcResiUserConstant.IN.equals(origin)){
+                    //||IcResiUserConstant.BIRTH.equals(origin)
                     //    迁入和出生的
                     inEntity = new IcUserChangeDetailedEntity();
                     inEntity.setCustomerId(formDTO.getCustomerId());
@@ -354,14 +358,16 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
         changeRecordEntity.setIcUserName(resiUserDTO.getName());
         //迁出存调动，死亡存注销
-        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())) {
+        if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())||IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) {
             changeRecordEntity.setType("transfer");
             changeRecordEntity.setTypeName("调动");
         } else if (IcResiUserConstant.DIED.equals(formDTO.getOrigin())) {
             changeRecordEntity.setType("logout");
             changeRecordEntity.setTypeName("注销");
-        } else if (IcResiUserConstant.IN.equals(formDTO.getOrigin()) || IcResiUserConstant.BIRTH.equals(formDTO.getOrigin())) {
-            //迁入和出生都是新增？？？
+        } else if (IcResiUserConstant.IN.equals(formDTO.getOrigin())) {
+            changeRecordEntity.setType("add");
+            changeRecordEntity.setTypeName("新增");
+        }else if(IcResiUserConstant.ADD.equals(formDTO.getOrigin())){
             changeRecordEntity.setType("add");
             changeRecordEntity.setTypeName("新增");
         }
@@ -458,8 +464,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查找迁入后的组织、网格、小区、楼栋、单元、房屋信息失败", "迁出至的房屋信息异常");
             }
         }
-        if (IcResiUserConstant.IN.equals(formDTO.getOrigin())
-                || IcResiUserConstant.BIRTH.equals(formDTO.getOrigin())) {
+        if (IcResiUserConstant.IN.equals(formDTO.getOrigin())) {
+            //|| IcResiUserConstant.BIRTH.equals(formDTO.getOrigin())
             //出生管理、迁入管理的查询当前选择的房屋信息
             IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO();
             orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId());