From 67efe2f55c5b1a5338e3d7008e66068856c19507 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 20 Apr 2022 14:29:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=99=85=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/IcBuildingListResultDTO.java    | 9 +++++++++
 .../src/main/resources/mapper/IcBuildingDao.xml          | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java
index ebaf6ca58e..c33d50956a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java
@@ -17,7 +17,16 @@ public class IcBuildingListResultDTO extends PageFormDTO {
 
     private static final long serialVersionUID = -8277921228438123299L;
     private String gridName;
+
+    /**
+     * 设计的房屋总数，就是这个楼上实际有几个
+     */
     private Integer totalHouseNum;
+
+    /**
+     * 实际录入房屋总数
+     */
+    private Integer realTotalHouseNum;
     private String latitude;
     private String agencyId;
     private Integer sort;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index d4561898a7..14a71d2e13 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -81,9 +81,9 @@
         a.SORT as sort,
         a.LONGITUDE as longitude,
         a.LATITUDE as latitude,
-        a.TYPE as buildingTypeKey
+        a.TYPE as buildingTypeKey,
+        (SELECT COUNT(1) FROM ic_house WHERE DEL_FLAG = '0' AND BUILDING_ID = a.ID) AS realTotalHouseNum
         from ic_building a
-
         LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID and b.DEL_FLAG='0'
         left join customer_agency c  on b.AGENCY_ID = c.ID and c.DEL_FLAG='0'
         left join customer_grid d  on b.GRID_ID = d.ID and d.DEL_FLAG='0'