Merge branch 'develop' into release_temp

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

@@ -18,10 +18,10 @@
 
     <select id="patrolList" resultType="com.epmet.dataaggre.dto.datastats.result.CustomerDataManageResultDTO$CustomerDataManage">
         SELECT
-            t.dateId, t.orgId, t.staffId, sum(t.patrolCount),SUM(t.patrolDurationInteger)
+            t.dateId, t.orgId, t.staffId, sum(t.patrol_total) patrolCount, SUM(t.total_time) patrolDurationInteger
         FROM (
             SELECT
-                date_id dateId, grid_id, staff_id staffId, patrol_total patrolCount, total_time patrolDurationInteger
+                date_id dateId, grid_id, staff_id staffId, patrol_total , total_time
                 <choose>
                     <when test='dataType == "agency"'>
                         , agency_id orgId