Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export

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;

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'