Merge branch 'dev_bugfix_0329_whistled_project_count' into dev

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

@@ -165,7 +165,7 @@
             AGENCY_ID,
             COUNT(DISTINCT PROJECT_ID) AS count
         FROM
-        fact_origin_project_log_daily
+        fact_origin_project_log_daily log
         WHERE DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
         AND IS_ACTIVE = '0'
@@ -173,13 +173,14 @@
            AND MONTH_ID = #{dimId}
            AND NOT EXISTS(
                 SELECT ID
-                FROM fact_origin_project_log_daily
+                FROM fact_origin_project_log_daily innerLog
                 WHERE DEL_FLAG = '0'
                 AND MONTH_ID <![CDATA[ < ]]> #{dimId}
                 AND IS_ACTIVE = '0'
+                AND log.project_id = innerLog.project_id
         <if test="agencies != null and agencies.size() > 0">
                 <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
-                    AGENCY_ID = #{agencyId}
+                    innerLog.AGENCY_ID = #{agencyId}
                 </foreach>
         </if>
             )
@@ -198,15 +199,19 @@
         COUNT(DISTINCT log.PROJECT_ID) AS count
         FROM
         fact_origin_project_log_daily log
-        LEFT JOIN fact_origin_project_main_daily project ON log.PROJECT_ID = project.ID AND project.DEL_FLAG = '0' AND project.CUSTOMER_ID = #{customerId}
         WHERE log.DEL_FLAG = '0'
-        AND project.PROJECT_STATUS LIKE 'close%'
         AND log.CUSTOMER_ID = #{customerId}
         AND log.IS_ACTIVE = '0'
-
         <if test='null != dimId and "" != dimId.trim()'>
             AND log.MONTH_ID = #{dimId}
+            AND EXISTS (
+            select innerLog.id from fact_origin_project_log_daily innerLog where innerLog.del_flag = '0'
+            and innerLog.customer_id = #{customerId} and innerLog.month_id = #{dimId}
+            and innerLog.action_code like 'close%'
+            and innerLog.project_id = log.project_id
+            )
         </if>
+
         <if test="agencies != null and agencies.size() > 0">
             <foreach collection="agencies" item="agencyId" open="AND (" close=" )" separator=" OR ">
                 log.AGENCY_ID = #{agencyId}