Merge branch 'dev'

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -769,32 +769,39 @@
 
     <select id="selectGirdMemberPatrol" resultType="com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO">
         SELECT
-            staff_id staffId,
+            a.staff_id staffId,
-            staff_name staffName,
+            a.staff_name staffName,
-            date_id dateId,
+            a.date_id dateId,
             IFNULL(
                 SUM(
-                    issue_to_project_count + closed_issue_count + project_response_count + project_transfer_count + project_closed_count
+                    a.issue_to_project_count + a.closed_issue_count + a.project_response_count + a.project_transfer_count + a.project_closed_count
-                )
+                ),
-            , 0)eventCount
+                0
-        FROM
+            ) eventCount
-            fact_grid_member_statistics_daily
+        FROM
-        WHERE
+            fact_grid_member_statistics_daily a
-            del_flag = '0'
+        INNER JOIN (
-        AND pids LIKE concat('%', #{agencyId}, '%')
+            SELECT
-        AND date_id = (
+                staff_id,
-            SELECT MAX(date_id)
+                MAX(date_id) date_id
-            FROM fact_grid_member_statistics_daily
+            FROM
-            WHERE
+                fact_grid_member_statistics_daily
-                del_flag = '0'
+            WHERE del_flag = '0'
+            AND pids LIKE concat('%', #{agencyId}, '%')
             <if test="dimType!= null and dimType == 'month' ">
                 AND month_id = #{dimId}
             </if>
             <if test="dimType!= null and dimType == 'year' ">
                 AND year_id = #{dimId}
             </if>
-        )
+            GROUP BY STAFF_ID
-        GROUP BY staff_id
+        ) b ON a.STAFF_ID = b.STAFF_ID AND a.date_id = b.date_id
+
+        WHERE
+            a.del_flag = '0'
+        AND a.pids LIKE concat('%', #{agencyId}, '%')
+        GROUP BY a.staff_id
+        ORDER BY a.date_id DESC
     </select>
 
     <select id="regUserList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">