Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event

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

@@ -1083,7 +1083,7 @@
         FROM
             fact_origin_project_main_daily
         WHERE
-            ORIGIN = 'agency'
+        (ORIGIN = 'agency' OR ORIGIN = 'resi_event')
           AND CUSTOMER_ID = #{customerId}
         <if test='null != dateId and "" != dateId'>
           AND DATE_ID = #{dateId}
@@ -1101,7 +1101,7 @@
         FROM
         fact_origin_project_main_daily
         WHERE
-        ORIGIN = 'agency'
+        (ORIGIN = 'agency' OR ORIGIN = 'resi_event')
         AND CUSTOMER_ID = #{customerId}
         <if test='null != dateId and "" != dateId'>
             AND DATE_ID &lt;= #{dateId}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -227,7 +227,7 @@
                 rero.ORG_ID,
                 rero.ORG_PID,
                 rero.ORG_PIDS,
-                re.PROJECT_ID.CREATED_BY,
+                re.CREATED_BY,
                 re.PROJECT_ID
         from resi_event_report_org rero
         inner join  resi_event re on rero.RESI_EVENT_ID = re.id and re.SHIFT_PROJECT = 1 and  re.DEL_FLAG = '0'