From b3a7a27a15b9a86c686dea18664d4b1ef3b281a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Sat, 30 May 2020 21:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 1465ee8ae..b368a8158 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -235,35 +235,18 @@
         SELECT
         epgr.GRID_ID gridId,
         COUNT( DISTINCT epgr.ID ) communityCount,
-        (
-        SELECT
-        count(DISTINCT user_id)
+        COUNT( DISTINCT ug.user_id ) communityMemberCount,
+        COUNT( DISTINCT ut.ID ) communityTopicCount
         FROM
-        esua_epdc_group.epdc_user_group
-        WHERE
-        DEL_FLAG = '0'
+        esua_epdc_group.epdc_group epgr
+        LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
-            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
-        AND epgr.id = group_id
-
-        ) AS communityMemberCount,
-        (
-        SELECT
-        count(1)
-        FROM
-        esua_epdc_group.epdc_topic
-        WHERE
-        DEL_FLAG = '0'
+        LEFT JOIN esua_epdc_group.epdc_topic ut ON epgr.id = ut.group_id AND ut.DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
-            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(ut.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
-        AND epgr.id = group_id
-
-        ) AS communityTopicCount
-
-        FROM
-        esua_epdc_group.epdc_group epgr
         WHERE
         epgr.DEL_FLAG = '0' AND ( epgr.STATE = '10' OR epgr.STATE = '15' )
         <if test="gridIdList != null and gridIdList.size() > 0">