From b379736d64c824b9f1582b9c6e5c89b6fa51deec Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 19 May 2020 17:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E3=80=91-=E3=80=90=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9=E3=80=91?=
 =?UTF-8?q?-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 20e022e37..f8859c63c 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
@@ -136,21 +136,21 @@
     <!--项目数-->
     <select id="selectListItemCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT
-            epen.GRID_ID gridId,
-            COUNT( epen.ID ) itemCount,
-            COUNT(epen.EVALUATION_SCORE = '2' OR NULL) itemPraiseCount,
-            count(epen.ITEM_STATE = '10' or epen.ITEM_STATE = '5' or null) itemCloseCount
+            GRID_ID AS gridId,
+            IFNULL(SUM( ITEM_STATE = 0 )+SUM( ITEM_STATE = 5 )+SUM( ITEM_STATE = 10 ),0) AS itemCount,
+            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_events.epdc_item epen
+            esua_epdc_analysis.meta_epdc_item
         WHERE
-            epen.DEL_FLAG = '0'
+            DEL_FLAG = '0'
             <if test="gridIdList != null and gridIdList.size() > 0">
-                AND epen.GRID_ID in <include refid="foreachGridIdList"></include>
+                AND GRID_ID in <include refid="foreachGridIdList"></include>
             </if>
             <if test="startTime != null and endTime != null and endTime != ''">
-                AND epen.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
+                AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
             </if>
-        GROUP BY epen.GRID_ID
+        GROUP BY GRID_ID
     </select>
 
     <!--社群数-->