From 5702279541a1494b65e1d0d42542e042e63d3876 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 23 Jul 2021 17:18:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=83=A8=E5=88=86Bug=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=85=88=E9=94=8B=E6=A8=A1=E8=8C=83=E6=95=B0=E6=8D=AEbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenBaseReportDataDao.xml | 1 + .../resources/mapper/screen/ScreenPublicDataDao.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml index 62b86f1e..aafb5a30 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml @@ -386,6 +386,7 @@ where sd.del_flag = '0' and sd.type_key in ( 'street_party', 'community_party' ) and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') + and ei.`GRID_ID` not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0') and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') group by sd.id; diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml index df22cbf0..359b5591 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml @@ -1021,9 +1021,9 @@ union all PARTY_GOOD_TIMES) as publishIssueTotal, 0 as topicTotal, 0 as publishTopicTotal, - sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal, + sum(PARTY_TOITEM_TIMES) as shiftProjectTotal, sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal, - sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal, + sum(PARTY_FINISH_TIMES) as resolvedProjectTotal, sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal from esua_epdc_analysis.epdc_dept_event_person_time ed where GRID_ID is not null @@ -1122,9 +1122,9 @@ UNION ALL PARTY_GOOD_TIMES) as publishIssueTotal, 0 as topicTotal, 0 as publishTopicTotal, - sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal, + sum(PARTY_TOITEM_TIMES) as shiftProjectTotal, sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal, - sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal, + sum(PARTY_FINISH_TIMES) as resolvedProjectTotal, sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal from esua_epdc_analysis.epdc_dept_event_person_time ed where GRID_ID is not null @@ -1225,9 +1225,9 @@ union all PARTY_GOOD_TIMES) as publishIssueTotal, 0 as topicTotal, 0 as publishTopicTotal, - sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal, + sum(PARTY_TOITEM_TIMES) as shiftProjectTotal, sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal, - sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal, + sum(PARTY_FINISH_TIMES) as resolvedProjectTotal, sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal from esua_epdc_analysis.epdc_dept_event_person_time ed where GRID_ID is not null