From a3ed034c05f34d3337277c869e908760f1a36281 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 11 Mar 2022 09:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B4=BB=E8=B7=83=E5=BA=A6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=B0=83=E6=95=B4=E4=B8=8A=E6=8A=A5=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=94=B9=E4=B8=BA=E7=BD=91=E6=A0=BC=E5=86=85?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dao/datastats/DataStatsDao.java | 7 +++++++ .../service/datastats/DataStatsService.java | 6 ++++++ .../datastats/impl/DataStatsServiceImpl.java | 9 +++++++++ .../service/govorg/impl/GovOrgServiceImpl.java | 6 ++++-- .../mapper/datastats/DatsStatsDao.xml | 18 ++++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index 4e8050c4f3..af97c5e52c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -366,4 +366,11 @@ public interface DataStatsDao { * @author sun */ List gridDateProjectIncrList(GridLivelyFormDTO formDTO); + + /** + * @Description 查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条 + * @author sun + */ + List getGridProejctToProjectMain(GridLivelyFormDTO formDTO); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index a42d6db2ad..dcda985bf4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -292,4 +292,10 @@ public interface DataStatsService { * @author sun */ List getGridDateProjectIncrList(GridLivelyFormDTO formDTO); + + /** + * @Description 查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条 + * @author sun + */ + List getGridProejctToProjectMain(GridLivelyFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 527b6a484b..f461727c34 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2217,4 +2217,13 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve public List getGridDateProjectIncrList(GridLivelyFormDTO formDTO) { return dataStatsDao.gridDateProjectIncrList(formDTO); } + + /** + * @Description 查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条 + * @author sun + */ + @Override + public List getGridProejctToProjectMain(GridLivelyFormDTO formDTO) { + return dataStatsDao.getGridProejctToProjectMain(formDTO); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index dc63adc141..03b3789fb1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -692,8 +692,10 @@ public class GovOrgServiceImpl implements GovOrgService { Map gridMap = gridList.stream().collect(Collectors.toMap(GridInfoResultDTO :: getGridId, v -> v, (v1, v2) -> v1)); //2.查询直属下级组织下网格在查询时间段内存在例行工作次数的网格,一天一条 List workList = epmetUserService.getGridDateRoutineWorkList(formDTO); - //3.查询直属下级组织下网格在查询时间段内存在上报事件(直接立项)数的网格，一天一条 - List projectList = dataStatsService.getGridDateProjectIncrList(formDTO); + /*//3.查询直属下级组织下网格在查询时间段内存在上报事件(直接立项)数的网格，一天一条 + List projectList = dataStatsService.getGridDateProjectIncrList(formDTO);*/ + //3.查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条 + List projectList = dataStatsService.getGridProejctToProjectMain(formDTO); //4.汇总数据，一个网格一天只记录一条数据，这条数据可能是例行工作的也可能是上报事件的，也可能某一天两个数都有，但只记录一条 Set map = workList.stream().map(o -> o.getGridId() + o.getDateId()).collect(Collectors.toSet()); projectList.stream().filter(pro -> !map.contains(pro.getGridId() + pro.getDateId())).forEach(p -> workList.add(p)); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 891e6f2cf4..106489dbb5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1180,4 +1180,22 @@ AND pids LIKE CONCAT('%', #{agencyId}, '%') GROUP BY grid_id, date_id + + +