From bceb7d0d42eb12f8b7ef17979ba74805619fc737 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 22 May 2020 17:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E9=A1=B9=E7=9B=AE=E5=8F=8A=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9=E3=80=91-?=
 =?UTF-8?q?=E3=80=90sql=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/05/22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/user/UserAnalysisDao.xml  | 13 +++++++------
 1 file changed, 7 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 aa68b0e19..8dcbdc9e1 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
@@ -128,7 +128,7 @@
         <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_events eee ON t.gridId = eee.GRID_ID AND eee.DEL_FLAG = '0' AND eee.EVENT_STATE = '4'
+        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>
@@ -144,7 +144,7 @@
             IFNULL(SUM( ITEM_STATE = '10' OR ITEM_STATE = '5' OR NULL ),0) AS itemCloseCount,
             IFNULL(SUM(EVALUATION_SCORE != '0' OR NULL),0) AS itemPraiseCount
         FROM
-            esua_epdc_analysis.meta_epdc_item
+            esua_epdc_events.epdc_item
         WHERE
             DEL_FLAG = '0'
             <if test="gridIdList != null and gridIdList.size() > 0">
@@ -551,9 +551,10 @@
                     ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_events.epdc_events epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
+        LEFT JOIN (select eie.ID,eie.ALL_DEPT_IDS,eie.DEL_FLAG,eie.CREATED_TIME from esua_epdc_events.epdc_issue eie
+                    left join 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'
-        AND epen.EVENT_STATE = '4'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
             AND epen.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
         </if>
@@ -578,12 +579,12 @@
             ad.`name`,
             ad.pid
             FROM
-            esua_epdc_analysis.meta_sys_dept ad
+                esua_epdc_admin.sys_dept ad
             WHERE
                 ad.id IN <include refid="foreachAllDeptIdsShow"></include>
                 AND ad.del_flag = 0
             ) t0
-        LEFT JOIN esua_epdc_analysis.meta_epdc_item epen ON find_in_set(t0.id, epen.ALL_DEPT_IDS)
+        LEFT JOIN esua_epdc_events.epdc_item 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 != ''">
             AND DATE_FORMAT(epen.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}