From 2e0263fa3514696a7327ca032d165c96f949c69e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Jun 2022 10:20:11 +0800
Subject: [PATCH] remark

---
 .../main/java/com/epmet/dto/result/IcHouseListResultDTO.java   | 2 ++
 .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 4c1b40288f..03a3431b68 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
@@ -79,6 +79,8 @@ public class IcHouseListResultDTO implements Serializable {
      */
     private String ownerIdCard;
 
+    private String remark;
+
     private Double sort;
 
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index a8222a88bb..54a455eac0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -112,7 +112,8 @@
         ag.ORGANIZATION_NAME agencyName,
         c.GRID_ID as gridId,
         gr.GRID_NAME,
-        IFNULL(a.sort,0) as sort
+        IFNULL(a.sort,0) as sort,
+        IFNULL(a.REMARK,'') AS remark
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'