From fa3917f6382a8edfec38e0b5b718cf99886db56c Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 25 May 2020 16:14:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90PC=E9=A1=B9=E7=9B=AE=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9=E3=80=91-=E3=80=90=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=A4=84=E7=90=86=E6=84=8F=E8=A7=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/user/UserAnalysisDao.xml        | 4 ++--
 1 file changed, 2 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 18a86644f..063a62906 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
@@ -154,7 +154,7 @@
             esua_epdc_events.epdc_item item
             LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process
             WHERE
-            DEL_FLAG = '0'
+            DEL_FLAG = '0' and (state=0 or state=5 or state=10 )
             <if test="endTime != null and endTime != ''">
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
             </if>
@@ -709,7 +709,7 @@
         left join esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID
         where sd.del_flag='0') item
         LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process WHERE
-        DEL_FLAG = '0'
+        DEL_FLAG = '0' and (state=0 or state=5 or state=10 )
         <if test="endTime != null and endTime != ''">
             AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
         </if>

From 34888bf19539bffdc79da120db6583e467ed99f5 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 25 May 2020 16:28:53 +0800
Subject: [PATCH 2/2] =?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

---
 .../resources/mapper/user/UserAnalysisDao.xml | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 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 063a62906..bfa128146 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,28 +113,32 @@
     <!--新闻数 通知数 议题数-->
     <select id="selectListNewsNoticeEventCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT
-             t.gridId,
+             dept.id,
              COUNT( DISTINCT nne.id ) newsCount,
-             COUNT( DISTINCT nnn.ID ) noticeCount,
+--              COUNT( DISTINCT nnn.ID ) noticeCount,
              COUNT( DISTINCT eee.ID ) eventCount
         FROM
-            <foreach collection="gridIdList" item="gridId" open="(" separator="UNION ALL" close=") t">
-                SELECT #{gridId} gridId
-            </foreach>
-        LEFT JOIN esua_epdc_news.epdc_news nne ON FIND_IN_SET(t.gridId,nne.ALL_DEPT_IDS) AND nne.DEL_FLAG = '0'
+        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_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(nne.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(eee.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
-        LEFT JOIN esua_epdc_news.epdc_notice nnn ON t.gridId = nnn.DEPT_ID AND nnn.DEL_FLAG = '0'
+        where
+        dept.DEL_FLAG = '0'
+        AND dept.type_key = 'grid_party'
         <if test="startTime != null and endTime != null and endTime != ''">
-            AND DATE_FORMAT(nnn.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(nne.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
-        LEFT JOIN esua_epdc_events.epdc_issue eee ON t.gridId = eee.GRID_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}
+        <if test="gridIdList != null and gridIdList.size() > 0">
+            AND  dept.id in <include refid="foreachGridIdList"></include>
         </if>
        GROUP BY
-         t.gridId
+        dept.id
     </select>
 
     <!--项目数-->