From 5d405d3ac93d52701cdf39e4f1618f7e8253c865 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 8 Jul 2021 10:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7bug=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E5=B7=A1=E6=9F=A5=E4=B8=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/epmetuser/StaffPatrolRecordDao.xml | 70 +++++++++++--------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
index 08a1699368..ce078c21f3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
@@ -53,48 +53,56 @@
 
     <select id="selectStaffPatrolList" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO">
         SELECT
+            d.latest_patrol_status AS status,
+            t.*
+        FROM(
+            SELECT
             ssp.grid_id AS gridId,
             ssp.staff_id AS staffId,
             cs.real_name AS staffName,
             cs.gender AS gender,
             IFNULL(MAX(ssp.latest_patrol_time), '') AS patrolStartTime,
             IFNULL(SUM(ssp.patrol_total), 0) AS patrolTotal,
-            ssp.latest_patrol_status AS STATUS,
+            MAX(DATE_ID) dateId,
             IFNULL(SUM(ssp.report_project_count), 0) AS reportProjectCount,
             IFNULL(SUM(ssp.total_time), 0) AS timeNum
-        FROM
+            FROM
             stats_staff_patrol_record_daily ssp
-        LEFT JOIN customer_staff cs ON ssp.staff_id = cs.user_id
-        WHERE
+            LEFT JOIN customer_staff cs ON ssp.staff_id = cs.user_id
+            WHERE
             ssp.del_flag = '0'
-        AND ssp.date_id >= #{patrolStartTime}
-        <if test="staffName!= null and staffName != ''">
-            AND cs.real_name = #{staffName}
-        </if>
-        <if test="gridIds != null and gridIds.size() > 0">
-            <foreach collection="gridIds" item="gridId" open="AND (" separator=" OR "  close=" )" >
-                ssp.grid_id = #{gridId}
-            </foreach>
-        </if>
-        GROUP BY ssp.grid_id, ssp.staff_id
-        <if test="sortCode!= null and sortCode != ''">
-            <choose>
-                <when test="sortCode == 'patrolTotal' ">
-                    ORDER BY SUM(ssp.patrol_total) DESC
-                </when>
-                <when test="sortCode == 'latestPatrolledTime' ">
-                    ORDER BY MAX(ssp.latest_patrol_time) DESC
-                </when>
-                <when test="sortCode == 'reportProjectCount' ">
-                    ORDER BY SUM(ssp.report_project_count) DESC
-                </when>
-                <otherwise>
-                    ORDER BY SUM(ssp.total_time) DESC
-                </otherwise>
-            </choose>
-        </if>
-        LIMIT
+            AND ssp.date_id >= #{patrolStartTime}
+            <if test="staffName!= null and staffName != ''">
+                AND cs.real_name = #{staffName}
+            </if>
+            <if test="gridIds != null and gridIds.size() > 0">
+                <foreach collection="gridIds" item="gridId" open="AND (" separator=" OR "  close=" )" >
+                    ssp.grid_id = #{gridId}
+                </foreach>
+            </if>
+            GROUP BY ssp.grid_id, ssp.staff_id
+            <if test="sortCode!= null and sortCode != ''">
+                <choose>
+                    <when test="sortCode == 'patrolTotal' ">
+                        ORDER BY SUM(ssp.patrol_total) DESC
+                    </when>
+                    <when test="sortCode == 'latestPatrolledTime' ">
+                        ORDER BY MAX(ssp.latest_patrol_time) DESC
+                    </when>
+                    <when test="sortCode == 'reportProjectCount' ">
+                        ORDER BY SUM(ssp.report_project_count) DESC
+                    </when>
+                    <otherwise>
+                        ORDER BY SUM(ssp.total_time) DESC
+                    </otherwise>
+                </choose>
+            </if>
+            LIMIT
             #{pageNo}, #{pageSize}
+        ) t
+        INNER JOIN stats_staff_patrol_record_daily d ON t.dateId = d.date_id
+        AND t.gridId = d.grid_id
+        AND t.staffId = d.staff_id
     </select>
 
     <select id="selectPersonalPatrolList" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO">