治理指数-解决率修改

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

@@ -980,34 +980,28 @@
     <select id="selectAgencyClosedProjectStaticDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
             a.ID AS AGENCY_ID,
-        b.`LEVEL`,
+            a.`LEVEL`,
-        COUNT( b.ID ) AS "sum",
+            COUNT( b.PROJECT_ID ) AS "sum",
-        SUM(
+          SUM(IF( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
-        IF
-        ( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
         FROM
             dim_agency a
             INNER JOIN (
             SELECT
-        a.ID,
+                PROJECT_ID,
-        a.PIDS,
+                PIDS,
-        c.`LEVEL`,
+                ORG_TYPE
-        b.ORG_TYPE
             FROM
-        fact_origin_project_main_daily a
+                fact_origin_project_log_daily
-        INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID
-        AND b.ACTION_CODE = 'close'
-        INNER JOIN dim_agency c ON b.AGENCY_ID = c.ID
             WHERE
-        a.CUSTOMER_ID = #{customerId}
+                CUSTOMER_ID = #{customerId}
-        AND a.DATE_ID &lt;= #{dateId}
+                AND DATE_ID &lt;= #{dateId}
-        AND a.PROJECT_STATUS = 'closed'
+                AND ACTION_CODE = 'close'
             ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
         WHERE
             a.CUSTOMER_ID = #{customerId}
         GROUP BY
             a.ID,
-        b.`LEVEL`
+            a.`LEVEL`
     </select>