From e16e266407fdf1a7e2dba611aa8e3ef2b838a2f8 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 2 Nov 2021 15:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E7=BD=91=E6=A0=BC=E5=91=98?=
 =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=95=B0=E6=8D=AE=E7=A8=8B=E5=BA=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/datastats/DatsStatsDao.xml         | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 90029209ad..228e1c3fc6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/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,
-            staff_name staffName,
-            date_id dateId,
+            a.staff_id staffId,
+            a.staff_name staffName,
+            a.date_id dateId,
             IFNULL(
                 SUM(
-                    issue_to_project_count + closed_issue_count + project_response_count + project_transfer_count + project_closed_count
-                )
-            , 0)eventCount
-        FROM
-            fact_grid_member_statistics_daily
-        WHERE
-            del_flag = '0'
-        AND pids LIKE concat('%', #{agencyId}, '%')
-        AND date_id = (
-            SELECT MAX(date_id)
-            FROM fact_grid_member_statistics_daily
-            WHERE
-                del_flag = '0'
+                    a.issue_to_project_count + a.closed_issue_count + a.project_response_count + a.project_transfer_count + a.project_closed_count
+                ),
+                0
+            ) eventCount
+        FROM
+            fact_grid_member_statistics_daily a
+        INNER JOIN (
+            SELECT
+                staff_id,
+                MAX(date_id) date_id
+            FROM
+                fact_grid_member_statistics_daily
+            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">