From 3b6c6202e15ad270a6192ac2b00e38d48aeb6052 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 12 May 2023 15:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=88=97=E8=A1=A8=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcPropertyManagementDao.xml        | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
index 88c1b8e2a0..64c35920e1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
@@ -71,19 +71,33 @@
     </select>
 
     <select id="queryList" parameterType="map" resultType="com.epmet.dto.IcPropertyManagementDTO">
-        select m.*
-        from ic_property_management m
-        where m.del_flag='0'
-          and m.customer_id=#{customerId}
-        <if test="name != null and name != ''">
-           and m.name like concat('%',#{name},'%')
-        </if>
-        <if test="contactName != null and contactName != ''">
-            and m.CONTACT_NAME like concat('%',#{contactName},'%')
-        </if>
-        <if test="contactMobile != null and contactMobile != ''">
-            and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
-        </if>
-        order by m.CREATED_TIME desc
+        select * from (
+            select m.*,
+                   (
+                    SELECT
+                        count(p.NEIGHBOR_HOOD_ID)
+                    FROM
+                        ic_neighbor_hood_property p
+                    INNER JOIN ic_neighbor_hood h
+                        ON ( p.NEIGHBOR_HOOD_ID = h.ID )
+                    WHERE p.DEL_FLAG = '0'
+                    and p.PROPERTY_ID =m.id
+                    AND (h.AGENCY_ID = #{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
+                    AND h.DEL_FLAG = '0'
+                )as totalNeighborHood
+            from ic_property_management m
+            where m.del_flag='0'
+              and m.customer_id=#{customerId}
+            <if test="name != null and name != ''">
+               and m.name like concat('%',#{name},'%')
+            </if>
+            <if test="contactName != null and contactName != ''">
+                and m.CONTACT_NAME like concat('%',#{contactName},'%')
+            </if>
+            <if test="contactMobile != null and contactMobile != ''">
+                and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
+            </if>
+        )t
+        order by t.totalNeighborHood desc,t.CREATED_TIME desc
     </select>
 </mapper>
\ No newline at end of file