From 4c06f7182cb904378874bb871cf7d29fc26a4dc1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 11 May 2022 14:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=85=A5=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/exception/EpmetErrorCode.java   | 1 +
 .../java/com/epmet/dto/result/IcMoveInListResultDTO.java    | 6 ++++++
 .../com/epmet/service/impl/IcMoveInRecordServiceImpl.java   | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 3b1ed3c0c4..8140096f7d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -254,6 +254,7 @@ public enum EpmetErrorCode {
 	IC_NAT_IDCARD_NATTIME(8923,"已存在相同记录"),
 	IC_NAT(8924,"平台已存在记录，请去修改原有记录"),
 	RESI_IC_NAT(8925,"已存在记录，请联系社区工作人员修改"),
+	IC_MOVE_IN(8926,"居民信息中房屋信息与当前选择房屋不一致，是否更新？"),
 
 
 	//通用错误码 start
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
index f64d31b3e2..3c9e8ee5fa 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcMoveInListResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.validator.group.AddGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -135,6 +137,10 @@ public class IcMoveInListResultDTO implements Serializable {
          * 来源地区地址
          */
         private String sourceAddress;
+        /**
+         * 详细地址
+         */
+        private String address;
 
         /**
          * 迁移证号码
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 df78445f0a..90db2141bc 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
@@ -165,9 +165,10 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         }
 
         //3.判断是否需要更新居民信息
-        if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
+        if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
+                && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
                 && StringUtils.isNotBlank(formDTO.getIsReplace()) && !"0".equals(formDTO.getIsReplace()) && !"1".equals(formDTO.getIsReplace())) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民信息中房屋信息与当前选择房屋不一致，是否更新？");
+            throw new EpmetException(EpmetErrorCode.IC_MOVE_IN.getCode(), EpmetErrorCode.IC_MOVE_IN.getMsg());
         }
 
         //4.勾选了补充居民信息且选择了更新信息的