From 6820d80040b5ba79546ff4bf78cce85f223eb32e Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Tue, 26 Apr 2022 17:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../poweraxis/PowerKernelHouseholdDao.xml     | 37 +++++++------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
index ee4f494..8a79a2a 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
@@ -22,19 +22,15 @@
 
     <select id="getTotal" resultType="java.lang.Long">
         SELECT
-            count(*)
+            count(distinct k.HOUSE_ID)
         FROM
             pli_power_kernel_household k
         LEFT JOIN
-            pli_power_axis_struct s
-        ON
-            s.id = k.STRUCT_REFERENCE_ID
+            pli_power_axis_struct s ON s.id = k.STRUCT_REFERENCE_ID AND s.DEL_FLAG = '0'
         WHERE
-            s.DEL_FLAG = '0'
-        AND k.DEL_FLAG = '0'
+        k.DEL_FLAG = '0'
         AND k.CUSTOMER_ID = #{customerId}
-        AND (s.pids LIKE '%${axisStructId}%'
-        OR s.id = #{axisStructId})
+        AND (s.pids LIKE '%${axisStructId}%' OR s.id = #{axisStructId})
     </select>
     <select id="getListPosition"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO">
@@ -73,26 +69,19 @@
             k.ADDRESS,
             m.KERNEL_MEMBER_ID,
             m.KERNEL_MEMBER_NAME,
-            concat_ws(',',m.KERNEL_MEMBER_NAME) as kernelMemberNameConcat
+            concat_ws( ',', m.KERNEL_MEMBER_NAME ) AS kernelMemberNameConcat
         FROM
             pli_power_kernel_household k
-        LEFT JOIN
-            pli_power_axis_struct s
-        ON
-            s.id = k.STRUCT_REFERENCE_ID
-        LEFT JOIN
-            pli_power_kernel_member m
-        ON
-            k.HOUSE_ID = m.HOUSE_ID
+            LEFT JOIN pli_power_axis_struct s ON s.id = k.STRUCT_REFERENCE_ID
+            AND s.DEL_FLAG = '0'
+            LEFT JOIN pli_power_kernel_member m ON k.HOUSE_ID = m.HOUSE_ID
+            AND m.DEL_FLAG = '0'
         WHERE
-            s.DEL_FLAG = '0'
-        AND k.DEL_FLAG = '0'
-        AND m.DEL_FLAG = '0'
+            k.DEL_FLAG = '0'
         AND k.CUSTOMER_ID = #{customerId}
-        AND (s.pids LIKE '%${axisStructId}%'
-        OR s.id = #{axisStructId})
-        GROUP BY k.id
-	    ORDER BY s.SORT
+        AND (s.pids LIKE '%${axisStructId}%' OR s.id = #{axisStructId})
+        GROUP BY k.HOUSE_ID
+	    ORDER BY k.CREATED_TIME,s.SORT
         limit #{pageNo},#{pageSize}
     </select>
     <select id="queryHouseIdList" resultType="java.lang.String">