From 8ef9501b92b9286f3a3153c60de24e289f426d11 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 1 Jul 2020 16:29:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StatsProjectServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 08913728bb..75d195285c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -67,10 +67,13 @@ public class StatsProjectServiceImpl implements StatsProjectService { @Override public void agencyProjectStats(ProjectStatsFormDTO formDTO) { Date date = yesterDay(); + //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行 if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) { date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN); } + //入参有客户Id的则按客户Id执行，没有的则全部客户都执行 if (null != formDTO.getCustomerId() && StringUtils.isNotBlank(formDTO.getCustomerId())) { + log.info("单独统计客户机关-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId()); customerAgencyStats(formDTO.getCustomerId(), date); } else { int pageNo = 1; @@ -361,15 +364,18 @@ public class StatsProjectServiceImpl implements StatsProjectService { /** * @Author sun - * @Description 数据-项目-机关日(月)统计 + * @Description 数据-项目-网格日(月)统计 **/ @Override public void gridProjectStats(ProjectStatsFormDTO formDTO) { Date date = yesterDay(); + //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行 if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) { date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN); } + //入参有客户Id的则按客户Id执行，没有的则全部客户都执行 if (null != formDTO.getCustomerId() && StringUtils.isNotBlank(formDTO.getCustomerId())) { + log.info("单独统计客户网格-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId()); customerGridStats(formDTO.getCustomerId(), date); } else { int pageNo = 1;