From aae3f8ca68e08f50921249b587f46d756940a798 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 5 Aug 2021 17:03:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E7=9B=B8?= =?UTF-8?q?=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} 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} AND DATE_ID <= #{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'