From b50690c8cde896018d3aea156ee5cacd86afa36e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 15 Apr 2022 15:14:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=B2=A1=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/IcHouseListResultDTO.java      | 56 ++++++++++++++-----
 .../epmet/service/impl/HouseServiceImpl.java  |  2 -
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 2ee335dace..3d12115f05 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -1,13 +1,13 @@
 
 package com.epmet.dto.result;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 import java.io.Serializable;
 
 /**
  * desc:房屋列表结果类
+ *
  * @author liujianjun
  */
 @Data
@@ -20,7 +20,7 @@ public class IcHouseListResultDTO implements Serializable {
 
     private String doorName;
 
-    private String agencyId;
+
     private String buildingId;
     private String houseName;
 
@@ -30,30 +30,56 @@ public class IcHouseListResultDTO implements Serializable {
     private String purposeKey;
 
     private String unitNumKey;
-    @Excel(name = "所属组织")
+    /**
+     * 所属组织
+     */
     private String agencyName;
-    @Excel(name = "所属网格")
+    private String agencyId;
+    /**
+     * 所属网格
+     */
     private String gridName;
-    @Excel(name = "所属小区")
+    private String gridId;
+    /**
+     * 所属小区
+     */
     private String neighborHoodName;
-    @Excel(name = "所属楼栋")
+    /**
+     * 所属楼栋
+     */
     private String buildingName;
-    @Excel(name = "单元号")
+    /**
+     * 单元号
+     */
     private String unitNum;
-    @Excel(name = "房屋类型")
+    /**
+     * 房屋类型
+     */
     private String houseType;
-    @Excel(name = "房屋用途")
+    private String houseTypeKey;
+    /**
+     * 房屋用途
+     */
     private String purpose;
-    @Excel(name = "是否出租")
+    /**
+     * 是否出租
+     */
     private Integer rentFlagKey;
-    @Excel(name = "房主姓名")
+
+    /**
+     * 房主姓名
+     */
     private String ownerName;
-    @Excel(name = "房主电话")
+    /**
+     * 房主电话
+     */
     private String ownerPhone;
-    @Excel(name = "房主身份证")
+    /**
+     * 房主身份证
+     */
     private String ownerIdCard;
-    private String gridId;
 
-    private String houseTypeKey;
+
+
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 7ad9c516b4..bac35ce64c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -104,8 +104,6 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
         IcHouseDTO icHouseDTO= ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
         icHouseDTO.setCustomerId(customerId);
-//        icHouseDTO.setRentFlag(formDTO.getRentFlag());
-
         icHouseDTO.setHouseName(getHouseName(formDTO));
         icHouseService.save(icHouseDTO);
     }

From 555bd39d1aaa70a46efe7d4878f84c507c8bf0d7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 15 Apr 2022 16:47:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=89=E9=87=8D=E7=82=B9=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E8=A1=8C=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
index 94ed60ce9f..285f8be11b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@@ -228,6 +228,9 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             e.setPid(agencyInfo.getPid());
             e.setPids(agencyInfo.getPids());
             e.setCustomerId(formDTO.getCustomerId());
+            if ("2".equals(e.getAttentionType())) {
+                e.setReason("有重点区域行程");
+            }
         });
         insertBatch(entities);
         //新增通知表信息