From aae3f8ca68e08f50921249b587f46d756940a798 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 5 Aug 2021 17:03:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/extract/FactOriginProjectMainDailyDao.xml | 4 ++--
 .../src/main/resources/mapper/project/ProjectDao.xml          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index 11ce137aab..fdf90af1f3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/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}
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 7b217ec4ff..476ae619c8 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
@@ -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'

From 732fa1bf1c85d9ba4a7f77a93e50a296331171cf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 17:05:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?resi=5Fevent.=E9=A1=B9=E7=9B=AEid.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 299c5b1676..c3591fa5fa 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -598,6 +598,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         resiEventEntity.setLatestOperatedTime(formDTO.getShiftProjectTime());
         resiEventEntity.setShiftProject(true);
         resiEventEntity.setRedDot(true);
+        resiEventEntity.setProjectId(formDTO.getProjectId());
         baseDao.updateById(resiEventEntity);
         // 2、记录操作日志
         ResiEventOperationLogEntity reCallLog=new ResiEventOperationLogEntity();