From 3ee852ed19095fe7df0dbef9873f6a2ff7bb220c Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 25 May 2020 18:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=80=E9=80=9A=E6=83=85=E5=86=B5=20=E3=80=91-=E3=80=90?=
 =?UTF-8?q?=E6=96=B0=E9=97=BBsql=E4=BC=98=E5=8C=96=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/user/UserAnalysisDao.xml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 bfa128146..1811fe545 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
@@ -113,17 +113,17 @@
     <!--新闻数 通知数 议题数-->
     <select id="selectListNewsNoticeEventCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT
-             dept.id,
+             dept.id gridId,
              COUNT( DISTINCT nne.id ) newsCount,
---              COUNT( DISTINCT nnn.ID ) noticeCount,
+             COUNT( DISTINCT nnn.ID ) noticeCount,
              COUNT( DISTINCT eee.ID ) eventCount
         FROM
         esua_epdc_admin.sys_dept dept
         LEFT JOIN	esua_epdc_news.epdc_news nne  ON  nne.DEPT_ID = dept.id AND nne.DEL_FLAG = '0'
-<!--        LEFT JOIN esua_epdc_news.epdc_notice nnn ON nnn.DEPT_ID = dept.id AND nnn.DEL_FLAG = '0'-->
-<!--        <if test="startTime != null and endTime != null and endTime != ''">-->
-<!--            AND DATE_FORMAT(nnn.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}-->
-<!--        </if>-->
+        LEFT JOIN esua_epdc_news.epdc_notice nnn ON nnn.DEPT_ID = dept.id AND nnn.DEL_FLAG = '0'
+        <if test="startTime != null and endTime != null and endTime != ''">
+            AND DATE_FORMAT(nnn.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+        </if>
         LEFT JOIN esua_epdc_events.epdc_issue eee ON eee.GRID_ID = dept.id AND eee.DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
             AND DATE_FORMAT(eee.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}