Merge branch 'dev_bugfix_0324_difficulty' into dev_temp

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

@@ -396,22 +396,24 @@
         (
 
              SELECT
-
             project.ID AS projectId,
-        IF(project.project_status = 'closed',period.handled_date,NOW()) AS finishDate
+            IFNULL(period.handled_date,NOW()) AS finishDate
-
+        FROM
-        FROM fact_origin_project_main_daily project LEFT JOIN fact_origin_project_org_period_daily period
+            fact_origin_project_main_daily project
-        ON project.ID = period.project_id AND period.del_flag = '0' AND period.customer_id = #{customerId}
+            LEFT JOIN fact_origin_project_org_period_daily period ON project.ID = period.project_id
+            AND period.del_flag = '0'
+            AND period.customer_id = #{customerId}
             AND period.operation = 'close'
-        WHERE project.customer_id = #{customerId} AND project.del_flag = '0'
+        WHERE
+            project.customer_id = #{customerId}
+            AND project.del_flag = '0'
                 ) projectFinishDate ON projectFinishDate.projectId = period.project_id
 
                 WHERE
                     period.del_flag = '0'
                     AND period.customer_id = #{customerId}
-            AND TIMESTAMPDIFF( DAY, period.informed_date, projectFinishDate.finishDate) > #{thresholdValue}
+                    AND TIMESTAMPDIFF( DAY, period.informed_date, IFNULL(period.handled_date,projectFinishDate.finishDate)) > #{thresholdValue}
                     )
-
     </select>
 
 <!-- 查询当天新立的项目，是为了增量新增难点赌点的图片库 -->