From 7067a2a1e4a0855be5f930c47b8707b3edfe739f Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 19 May 2020 09:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=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=E7=A4=BE=E7=BE=A4?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E8=AE=A1=E7=AE=97sql=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05/19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/user/UserAnalysisDao.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 3485a5d16..23729faf0 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
@@ -125,9 +125,9 @@
          LEFT JOIN esua_epdc_events.epdc_events eee ON t.gridId = eee.GRID_ID AND eee.DEL_FLAG = '0' AND eee.EVENT_STATE = '4'
         where 1=1
         <if test="startTime != null and endTime != null and endTime != ''">
-            AND nne.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
-            AND nnn.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
-            AND eee.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(nne.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(nnn.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(eee.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
         GROUP BY
          t.gridId
@@ -170,7 +170,7 @@
             AND epgr.GRID_ID in <include refid="foreachGridIdList"></include>
         </if>
         <if test="startTime != null and endTime != null and endTime != ''">
-            AND epgr.CREATED_TIME BETWEEN #{startTime} AND #{endTime}
+            AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
         </if>
         GROUP BY epgr.GRID_ID
     </select>
@@ -625,7 +625,7 @@
     <select id="selectExportCommunityMemberCount" resultType="com.elink.esua.epdc.dto.user.result.ExportOperationDataResultDTO">
         SELECT
             t0.`name` streetName,
-            COUNT(ug.ID) communityMemberCount
+            COUNT(ug.user_id) communityMemberCount
         FROM
             (
                 SELECT
@@ -641,10 +641,10 @@
         LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
         AND epgr.DEL_FLAG = '0'
         <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
-            AND epgr.CREATED_TIME BETWEEN #{operationStartTime} AND #{operationEndTime}
+            AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and epgr.CREATED_TIME &lt;=#{endTime}
+            and DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
         </if>
         AND (
             epgr.STATE = '10'