From 012023d12aff18b2d43982416d15285256daf8ac Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Sat, 17 Sep 2022 01:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E6=8E=92=E5=BA=8F=E6=94=B9=E4=B8=BA=E5=92=8C?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=B9=B3=E5=8F=B0=E6=88=BF=E5=B1=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=B8=E5=90=8C=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/IcHouseDao.java   |  2 +
 .../service/impl/IcHouseServiceImpl.java      | 11 +++--
 .../src/main/resources/mapper/IcHouseDao.xml  | 45 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index 4d5c986eff..1f3ceacfe5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -211,4 +211,6 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     IcHouseEntity getHouseInfoByName(CheckHouseInfoFormDTO formDTO);
 
     List<IcHouseListResultDTO> houseStatisListDetail(HouseChartFormDTO formDTO);
+
+    List<IcHouseEntity> selectListForRenFangStats(@Param("buildingId") String buildingId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 2a1b036570..0f69fc8816 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -162,10 +162,13 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     @Override
     public List<HouseListResultDTO> getHouseList(TokenDto tokenDto, HouseFormDTO formDTO) {
         //查询楼栋下房屋列表
-        LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId());
-        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
-        List<IcHouseEntity> list = baseDao.selectList(wrapper);
+//        LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId());
+//        wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC");
+//        List<IcHouseEntity> list = baseDao.selectList(wrapper);
+
+        List<IcHouseEntity> list = baseDao.selectListForRenFangStats(formDTO.getBuildingId());
+
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
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 5cfdd0fd4d..ed9bc5acd9 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
@@ -638,5 +638,48 @@
             CONVERT(a.DOOR_NAME using gbk)
     </select>
 
-
+    <select id="selectListForRenFangStats" resultMap="icHouseMap">
+        select a.id,
+               a.customer_id,
+               a.org_id_path,
+               a.neighbor_hood_id,
+               a.part_id,
+               a.building_id,
+               a.building_unit_id,
+               a.house_name,
+               a.door_name,
+               a.full_name,
+               a.house_type,
+               a.purpose,
+               a.rent_flag,
+               a.owner_name,
+               a.owner_phone,
+               a.owner_id_card,
+               a.resi_number,
+               a.avg_ysr,
+               a.sort,
+               a.del_flag,
+               a.revision,
+               a.created_by,
+               a.created_time,
+               a.updated_by,
+               a.updated_time,
+               a.remark,
+               a.house_code,
+               a.house_qrcode_url,
+               a.coding
+        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'
+                     LEFT JOIN ic_building_unit d on a.building_unit_id = d.id and d.del_flag = '0'
+        where a.BUILDING_ID = #{buildingId}
+          and a.DEL_FLAG = '0'
+        order by
+            a.sort,
+            CONVERT(c.NEIGHBOR_HOOD_NAME using gbk),
+            CONVERT(b.BUILDING_NAME USING gbk),
+            CONVERT(d.UNIT_NAME USING gbk),
+            CAST(a.DOOR_NAME AS SIGNED),
+            CONVERT(a.DOOR_NAME using gbk)
+    </select>
 </mapper>