【用户数据分析-网格开通情况】-【社群成员计算sql修改】-（魏凯）-2020/05/19

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'