修改统计逻辑

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml

@@ -33,8 +33,19 @@
 
     <select id="listPage" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
         SELECT
-        a.*,
+        d.AGENCY_NAME AS AGENCY_NAME,
-        d.AGENCY_NAME
+        max( NEIGHBOURHOODS_COUNT ) AS NEIGHBOURHOODS_COUNT,
+        max( HOUSE_COUNT ) AS HOUSE_COUNT,
+        max( HOUSE_SELF_COUNT ) AS HOUSE_SELF_COUNT,
+        max( HOUSE_LEASE_COUNT ) AS HOUSE_LEASE_COUNT,
+        max( HOUSE_IDLE_COUNT ) AS HOUSE_IDLE_COUNT,
+        max( USER_COUNT ) AS USER_COUNT,
+        max( USER_RESI_COUNT ) AS USER_RESI_COUNT,
+        max( USER_FLOAT_COUNT ) AS USER_FLOAT_COUNT,
+        max( HOUSE_INCR ) AS HOUSE_INCR,
+        max( HOUSE_MODIFY ) AS HOUSE_MODIFY,
+        max( USER_INCR ) AS USER_INCR,
+        max( USER_MODIFY ) AS USER_MODIFY
         FROM
         fact_agency_user_house_daily a
         LEFT JOIN dim_agency d ON d.id = a.AGENCY_ID
@@ -45,14 +56,29 @@
         <if test="agencyId != null and agencyId != ''">
             AND a.AGENCY_ID = #{agencyId}
         </if>
+        <if test="dateId != null and dateId != ''">
+            AND a.DATE_ID = #{dateId}
+        </if>
+        <if test="level == 'street'">
+            AND a.LEVEL = 'community'
+        </if>
+        <if test="level == 'district'">
+            AND a.LEVEL = 'street'
+        </if>
+        <if test="level == 'city'">
+            AND a.LEVEL = 'district'
+        </if>
+        <if test="level == 'province'">
+            AND a.LEVEL = 'city'
+        </if>
         <if test="startTime != null and startTime != ''">
-            AND a.DATE_ID >= #{startTime}
+            AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
         </if>
         <if test="endTime != null and endTime != ''">
-            AND a.DATE_ID &lt;= #{endTime}
+            AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
         </if>
-        ORDER BY
+        GROUP BY
-        a.CREATED_TIME DESC
+        a.AGENCY_ID
     </select>
 
     <delete id="deleteByDateId">

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml

@@ -32,27 +32,40 @@
 
     <select id="listPage" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">
         SELECT
-        g.*,
+        g.GRID_NAME AS AGENCY_NAME,
-        g.GRID_ID AS agencyId,
+        max( NEIGHBOURHOODS_COUNT ) AS NEIGHBOURHOODS_COUNT,
-        d.GRID_NAME AS agencyName
+        max( HOUSE_COUNT ) AS HOUSE_COUNT,
+        max( HOUSE_SELF_COUNT ) AS HOUSE_SELF_COUNT,
+        max( HOUSE_LEASE_COUNT ) AS HOUSE_LEASE_COUNT,
+        max( HOUSE_IDLE_COUNT ) AS HOUSE_IDLE_COUNT,
+        max( USER_COUNT ) AS USER_COUNT,
+        max( USER_RESI_COUNT ) AS USER_RESI_COUNT,
+        max( USER_FLOAT_COUNT ) AS USER_FLOAT_COUNT,
+        max( HOUSE_INCR ) AS HOUSE_INCR,
+        max( HOUSE_MODIFY ) AS HOUSE_MODIFY,
+        max( USER_INCR ) AS USER_INCR,
+        max( USER_MODIFY ) AS USER_MODIFY
         FROM
-        fact_grid_user_house_daily g
+        fact_grid_user_house_daily d
-        LEFT JOIN dim_grid d ON d.id = g.GRID_ID
+        LEFT JOIN dim_grid g ON g.id = d.GRID_ID
         <if test="customerId != null and customerId != ''">
             AND g.CUSTOMER_ID = #{customerId}
             AND d.CUSTOMER_ID = #{customerId}
         </if>
         <if test="agencyId != null and agencyId != ''">
-            AND g.GRID_ID = #{agencyId}
+            AND d.GRID_ID = #{agencyId}
+        </if>
+        <if test="dateId != null and dateId != ''">
+            AND d.DATE_ID = #{dateId}
         </if>
         <if test="startTime != null and startTime != ''">
-            AND g.DATE_ID >= #{startTime}
+            AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
         </if>
         <if test="endTime != null and endTime != ''">
-            AND g.DATE_ID &lt;= #{endTime}
+            AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
         </if>
-        ORDER BY
+        GROUP BY
-        g.CREATED_TIME DESC
+        GRID_ID
     </select>
 
     <select id="statAgency" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">