From 5ede44bded381808636deeb689a180dd2ddaea69 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 29 May 2020 10:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=20=E3=80=91-=E3=80=90?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85=E5=86=B5=20?=
 =?UTF-8?q?=E6=96=B0=E9=97=BBsql=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05/29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml | 52 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 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 0ad3ad0e5..80be098f1 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
@@ -112,7 +112,7 @@
 
     <!--新闻数 通知数 议题数-->
     <select id="selectListNewsNoticeEventCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
-        SELECT
+    <!--  SELECT
              dept.id gridId,
              COUNT( DISTINCT nne.id ) newsCount,
              COUNT( DISTINCT nnn.ID ) noticeCount,
@@ -138,7 +138,55 @@
             AND  dept.id in <include refid="foreachGridIdList"></include>
         </if>
        GROUP BY
-        dept.id
+        dept.id　-->
+        SELECT
+        dept.id gridId,
+        (
+        SELECT
+        count(1)
+        FROM
+        esua_epdc_news.epdc_news
+        WHERE
+        DEL_FLAG = '0'
+        <if test="startTime != null and endTime != null and endTime != ''">
+            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+        </if>
+        AND DEPT_ID = dept.id
+
+        ) AS newsCount,
+        (
+        SELECT
+        count(1)
+        FROM
+        esua_epdc_news.epdc_notice
+        WHERE
+        DEL_FLAG = '0'
+        <if test="startTime != null and endTime != null and endTime != ''">
+            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+        </if>
+        AND DEPT_ID = dept.id
+
+        ) AS noticeCount,
+        (SELECT
+        count(1)
+        FROM
+        esua_epdc_events.epdc_issue
+        WHERE
+        DEL_FLAG = '0'
+        <if test="startTime != null and endTime != null and endTime != ''">
+            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+        </if>
+        AND GRID_ID = dept.id
+        ) AS eventCount
+        FROM
+        esua_epdc_admin.sys_dept dept
+        WHERE
+        dept.DEL_FLAG = '0'
+        AND dept.type_key = 'grid_party'
+        <if test="gridIdList != null and gridIdList.size() > 0">
+            AND  dept.id in <include refid="foreachGridIdList"></include>
+        </if>
+        GROUP BY dept.id
     </select>
 
     <!--项目数-->