diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml index 0901fa61..30b65621 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml @@ -41,14 +41,14 @@ SUM(a.projectCount) as projectCount, SUM(a.projectIncr)projectIncr, SUM(a.issueToProjectCount)issueToProjectCount, - SUM(a.closedIssueCount)closedIssueCount, - SUM(a.projectResponseCount)projectResponseCount, - SUM(a.projectTransferCount)projectTransferCount, - SUM(a.projectClosedCount)projectClosedCount, SUM(a.issueToProjectIncr)issueToProjectIncr, + SUM(a.closedIssueCount)closedIssueCount, SUM(a.closedIssueIncr)closedIssueIncr, + SUM(a.projectResponseCount)projectResponseCount, SUM(a.projectResponseIncr)projectResponseIncr, + SUM(a.projectTransferCount)projectTransferCount, SUM(a.projectTransferIncr)projectTransferIncr, + SUM(a.projectClosedCount)projectClosedCount, SUM(a.projectClosedIncr)projectClosedIncr from( select @@ -67,14 +67,14 @@ 0 as issueToProjectCount, - 0 as closedIssueCount, - 0 as projectResponseCount, - 0 as projectTransferCount, - 0 as projectClosedCount, 0 as issueToProjectIncr, + 0 as closedIssueCount, 0 as closedIssueIncr, + 0 as projectResponseCount, 0 as projectResponseIncr, + 0 as projectTransferCount, 0 as projectTransferIncr, + 0 as projectClosedCount, 0 as projectClosedIncr from esua_epdc_admin.sys_epmet_user_relation seur right join esua_epdc_events.epdc_events ee on ee.MOBILE = seur.MOBILE and ee.DEL_FLAG = '0' @@ -104,12 +104,12 @@ 0 as closedIssueCount, - 0 as projectResponseCount, - 0 as projectTransferCount, - 0 as projectClosedCount, 0 as closedIssueIncr, + 0 as projectResponseCount, 0 as projectResponseIncr, + 0 as projectTransferCount, 0 as projectTransferIncr, + 0 as projectClosedCount, 0 as projectClosedIncr from esua_epdc_admin.sys_epmet_user_relation seur left join esua_epdc_admin.sys_user eu on eu.MOBILE = seur.MOBILE @@ -130,6 +130,7 @@ 0 as projectCount, 0 as projectIncr, 0 as issueToProjectCount, + 0 as issueToProjectIncr, count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{endTime} or null) as closedIssueCount, -- 议题关闭数,截止到当前dateId的总数 @@ -141,11 +142,10 @@ 0 as projectResponseCount, - 0 as projectTransferCount, - 0 as projectClosedCount, - 0 as issueToProjectIncr, 0 as projectResponseIncr, + 0 as projectTransferCount, 0 as projectTransferIncr, + 0 as projectClosedCount, 0 as projectClosedIncr from esua_epdc_admin.sys_epmet_user_relation seur left join esua_epdc_admin.sys_user eu on eu.MOBILE = seur.MOBILE @@ -167,24 +167,24 @@ 0 as projectCount, 0 as projectIncr, 0 as issueToProjectCount, + 0 as issueToProjectIncr, 0 as closedIssueCount, - 0 as issueToProjectIncr, 0 as closedIssueIncr, count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{endTime} and ei.STATE = 0 and eid.ID is null or null) as projectResponseCount, -- 项目响应数,截止到当前dateId的总数 - count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{endTime} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferCount, -- 项目吹哨数,截止到当前dateId的总数 - count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{endTime} and ei.STATE = 10 or null) as projectClosedCount, -- 项目结案数，截止到当前dateId的总数 count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} and ei.STATE = 0 and eid.ID is null or null) as projectResponseIncr, -- 项目响应数，dateId这一天的增量 + count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{endTime} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferCount, -- 项目吹哨数,截止到当前dateId的总数 count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferIncr, -- 项目吹哨数，dateId这一天的增量 + count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{endTime} and ei.STATE = 10 or null) as projectClosedCount, -- 项目结案数，截止到当前dateId的总数 count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{endTime} and ei.STATE = 10 or null) as projectClosedIncr -- 项目结案数，dateId这一天的增量 count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{yearMonthDay} and ei.STATE = 0 and eid.ID is null or null) as projectResponseCount, -- 项目响应数,截止到当前dateId的总数 - count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{yearMonthDay} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferCount, -- 项目吹哨数,截止到当前dateId的总数 - count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{yearMonthDay} and ei.STATE = 10 or null) as projectClosedCount, -- 项目结案数，截止到当前dateId的总数 count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 0 and eid.ID is null or null) as projectResponseIncr, -- 项目响应数，dateId这一天的增量 + count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{yearMonthDay} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferCount, -- 项目吹哨数,截止到当前dateId的总数 count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 0 and eid.ID is not null or null) as projectTransferIncr, -- 项目吹哨数，dateId这一天的增量 + count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= #{yearMonthDay} and ei.STATE = 10 or null) as projectClosedCount, -- 项目结案数，截止到当前dateId的总数 count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = #{yearMonthDay} and ei.STATE = 10 or null) as projectClosedIncr -- 项目结案数，dateId这一天的增量