Merge branch 'dev_patrol_stats' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -52,6 +52,10 @@
     </select>
 
     <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,
@@ -59,7 +63,7 @@
             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
@@ -95,6 +99,10 @@
             </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">