From d32df3d1b22bee5003c80c19c671a670de72d303 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 21 Jul 2020 10:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=94=A6=E6=B0=B4pc=E7=AB=AF=E3=80=91?=
 =?UTF-8?q?-=E3=80=90=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E3=80=91=E4=BF=AE=E6=94=B9=E8=AE=AE=E9=A2=98=E6=95=B0?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=20-=E9=AD=8F=E5=87=AF=2020?=
 =?UTF-8?q?20-07-21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 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 fe8117c1..41410a4e 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
@@ -36,14 +36,13 @@
         SELECT
         count(1)
         FROM
-        js_esua_epdc_events.epdc_events
+        js_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}
+            AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
-        AND GRID_ID =dept.id
+        AND GRID_ID = dept.id
         ) AS eventCount
         FROM
         js_esua_epdc_admin.sys_dept dept
@@ -431,16 +430,9 @@
                 AND ad.del_flag = 0
             ) t0
         LEFT JOIN (
-                    SELECT
-                    eve.ID,
-                    eve.ALL_DEPT_IDS,
-                    eve.DEL_FLAG,
-                    eve.CREATED_TIME
-                    FROM
-                    js_esua_epdc_events.epdc_events eve
-                    LEFT join js_esua_epdc_admin.sys_dept sd ON eve.GRID_ID = sd.ID and sd.del_flag = '0'
-                    WHERE
-                    eve.EVENT_STATE in (0,2)
+        select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from js_esua_epdc_events.epdc_issue eie
+        left join js_esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID
+        where sd.del_flag='0'
                     )epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
         AND epen.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">