From 743b2a3f6bf69e206bc09691890d355274b12003 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 23 May 2022 15:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E6=B6=89=E5=8F=8A=E5=88=B0=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectLogDailyDao.xml           | 10 +++++-----
 .../src/main/resources/mapper/project/ProjectDao.xml   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
index 83158a9711..cdf8395fd2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
@@ -141,7 +141,7 @@
 
             WHERE
                 1 = 1
-                AND f.ORIGIN = 'issue'
+                AND f.ORIGIN IN('issue', 'ic_event')
                 AND f.PROJECT_STATUS = 'closed'
                 AND f.CUSTOMER_ID = #{customerId}
             ) a
@@ -468,7 +468,7 @@
                   AND fm.MONTH_ID = #{monthId}
                   AND fm.PROJECT_STATUS = 'closed'
                   AND fm.GRID_ID != ''
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             GRID_ID
@@ -490,7 +490,7 @@
                 WHERE  fm.CUSTOMER_ID = #{customerId}
                     AND fm.MONTH_ID = #{monthId}
                   AND fm.PROJECT_STATUS = 'closed'
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             AGENCY_ID
@@ -680,7 +680,7 @@
                     fm.CUSTOMER_ID = #{customerId}
                   AND fm.PROJECT_STATUS = 'closed'
                   AND fm.GRID_ID != ''
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             GRID_ID
@@ -701,7 +701,7 @@
                     INNER JOIN fact_origin_project_main_daily fm ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
                 WHERE  fm.CUSTOMER_ID = #{customerId}
                   AND fm.PROJECT_STATUS = 'closed'
-                  AND fm.ORIGIN = 'issue'
+                  AND fm.ORIGIN IN('issue', 'ic_event')
             ) a
         GROUP BY
             AGENCY_ID
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index f309d79bf4..2949e36b6f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -58,7 +58,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
+          AND ORIGIN IN('issue', 'resi_event', 'ic_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') <![CDATA[ <= ]]> #{date}
@@ -72,7 +72,7 @@
         FROM project
         WHERE
             DEL_FLAG = '0'
-          AND (ORIGIN = 'issue' OR ORIGIN = 'resi_event')
+          AND ORIGIN IN('issue', 'resi_event', 'ic_event')
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
           AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') = #{date}