From 3bcb43d8035fcd533cd312a5e51fa46f9fb38bc5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 24 Jun 2022 09:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98=E8=BF=81?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/MoveOutDetailResultDTO.java   |  1 +
 .../service/impl/IcResiUserConfirmServiceImpl.java | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java
index d76fdbc21b..976a212dbe 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MoveOutDetailResultDTO.java
@@ -38,4 +38,5 @@ public class MoveOutDetailResultDTO implements Serializable {
     private Date createdTime;
     private String reason;
     private String xxdz;
+    private Boolean isInHome;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
index 85208ff826..4522c505bc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserConfirmServiceImpl.java
@@ -293,8 +293,6 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
     public MoveOutDetailResultDTO moveOutConfirmDetail(String customerId, String id) {
         MoveOutDetailResultDTO result = baseDao.getMoveOutConfirmDetail(id);
         if (null != result) {
-            //获取网格信息
-            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId());
             //获取房屋信息
             HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, result.getHomeId());
             if (null == houseInfo) {
@@ -305,6 +303,18 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl<IcResiUserConf
             result.setBuildName(houseInfo.getBuildingName());
             result.setUnitName(houseInfo.getUnitName());
             result.setHomeName(houseInfo.getDoorName());
+            if (NumConstant.ZERO_STR.equals(result.getConfirmResult())) {
+                LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(IcResiUserEntity::getId, result.getIcResiUserId());
+                wrapper.eq(IcResiUserEntity::getHomeId, result.getHomeId());
+                wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR);
+                IcResiUserEntity entity = icResiUserDao.selectOne(wrapper);
+                if (null == entity) {
+                    result.setIsInHome(false);
+                } else {
+                    result.setIsInHome(true);
+                }
+            }
         }
 
         return result;