From af15c242a052a858c76e7f222638d57655dfe2fc Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Tue, 5 Dec 2023 14:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=B7=9F=E5=B0=8F=E5=8C=BA?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personroom/EpidemicBuildingUnitDao.xml    | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
index 1c0135c..830cf28 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml
@@ -30,13 +30,48 @@
 
     <select id="getUnitPage" resultType="com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO">
         SELECT
-            u.*,
+            u.ROOM_TYPE,
+            p.STREET_NAME,
+            p.COMMUNITY_NAME,
+            GROUP_CONCAT( d.`name` SEPARATOR ',' ) GRID_NAME,
+            p.PLOT_NAME,
             b.BUILDING_NAME,
-            p.PLOT_NAME
+            u.UNIT,
+            u.ROOM_NO,
+            u.MA_URL,
+            u.BUILDING_ID,
+            p.COMMUNITY_ID,
+            g.GRID_ID,
+            u.ID,
+            u.IS_RENTAL,
+            u.OWNER_NAME,
+            u.ID_CARD,
+            u.LESSEE_DATE,
+            u.LESSEE_NAME,
+            u.LESSEE_ID_CARD,
+            u.LESSEE_MOBILE,
+            u.LESSEE_NAME,
+            u.LESSEE_TIME,
+            u.LESSEE_UNIT,
+            u.LIVING_STATUS,
+            u.MOBILE,
+            u.RENTAL_PURPOSE,
+            u.ROAD_NAME,
+            u.ROOM_CODE,
+            u.ROOM_CODE_SHOW,
+            u.ROOM_MA_CODE,
+            u.ROOM_NO,
+            u.ROOM_STATUS,
+            u.ROOM_TYPE,
+            u.ROOM_USE,
+            p.STREET_ID,
+            u.UNIT_MA_CODE
         FROM
             epidemic_building_unit u
             LEFT JOIN epidemic_plot_building b ON u.BUILDING_ID = b.id
             LEFT JOIN epidemic_plot_coordinate p ON b.PLOT_ID = p.id
+            LEFT JOIN epidemic_plot_grid g ON g.PLOT_ID = p.id
+            LEFT JOIN esua_epdc_admin.sys_dept d ON d.id = g.GRID_ID
         <if test="(ownerName != null and ownerName !='') or (idCard != null and idCard !='') or (mobile != null and mobile !='')">
             LEFT JOIN epidemic_unit_owner o ON o.UNIT_ID = u.id
         </if>
@@ -99,6 +134,7 @@
                 #{id}
             </foreach>
         </if>
+        GROUP BY u.ID
         ORDER BY u.CREATED_TIME DESC
     </select>