Merge branch 'dev'

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

@@ -4,7 +4,7 @@
     <select id="getPatrolSumList" resultType="com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult">
     <foreach collection="agencyFullIdList" item="fullAgencyId" separator="UNION ALL">
         SELECT
-            LEFT (GRID_PIDS,LENGTH( #{fullAgencyId} )) fullAgencyId,
+            #{fullAgencyId} fullAgencyId,
             sum(patrol_total) patrolTotal,
             sum(TOTAL_TIME) totalTime
         FROM stats_staff_patrol_record_daily

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectOrgPeriodDailyDao.xml

@@ -53,7 +53,7 @@
             f.ORG_ID AS "agencyId",
             SUM( TIMESTAMPDIFF( MINUTE, ( DATE_FORMAT( f.INFORMED_DATE, '%Y-%m-%d %H:%i' )),
             ( DATE_FORMAT( f.PERIOD_TILL_REPLY_FIRSTLY, '%Y-%m-%d %H:%i' )) ) ) AS "sum",
-            COUNT( f.ID ) AS "count"
+            COUNT(DISTINCT f.PROJECT_ID) AS "count"
         FROM
             fact_origin_project_org_period_daily f
                 INNER JOIN dim_agency da ON f.ORG_ID = da.ID
@@ -128,7 +128,7 @@
             fp.ORG_ID,
             SUM( TIMESTAMPDIFF( MINUTE, ( DATE_FORMAT( fp.INFORMED_DATE, '%Y-%m-%d %H:%i' )),
                                 ( DATE_FORMAT( fp.PERIOD_TILL_REPLY_FIRSTLY, '%Y-%m-%d %H:%i' )) ) ) AS "sum",
-            COUNT( fp.ID ) AS "count"
+            COUNT( DISTINCT fp.PROJECT_ID ) AS "count"
         FROM
             fact_origin_project_org_period_daily fp
         INNER JOIN fact_origin_project_main_daily fm ON fp.PROJECT_ID = fm.ID