From 7f04edff212cb7d2f85367a9a22811dea3aa7032 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Sep 2020 10:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=9C=88=E6=8A=BD=E5=8F=96=20?= =?UTF-8?q?=E6=9C=88=E4=BB=BD=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 2 +- .../indexcoll/impl/FactIndexCollectServiceImpl.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index ca37775756..e1594766df 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -96,7 +96,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { } else if (StringUtils.isNotBlank(formDTO.getMonthId())) { extractMonthly(customerId, formDTO.getMonthId()); } else { - String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", ""); + String dateId = LocalDate.now().minusMonths(NumConstant.ONE).toString().replace("-", ""); extractMonthly(customerId, dateId); } }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java index ade95f1c5d..0732ac80c5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java @@ -641,11 +641,15 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { List parentAgencyList = screenCustomerAgencyDao.selectListAgencyInfo(customerId); int j = 0; for(Map.Entry> agencyScore : collect.entrySet()){ + if (NumConstant.ZERO_STR.equals(agencyScore.getKey())) { + log.warn("insertIndexDataMonthlyByAgencyScore agencyyId is 0"); + continue; + } IndexDataMonthlyFormDTO monthlyFormDTO = new IndexDataMonthlyFormDTO(); // 给4个指数 赋默认值 monthlyFormDTO = this.setIndexDefaultValueFor(monthlyFormDTO); - for ( int i = 0; i < agencyScore.getValue().size(); i++){ - if (NumConstant.ONE_STR.equals(agencyScore.getValue().get(i).getIsTotal())){ + for (int i = 0; i < agencyScore.getValue().size(); i++) { + if (NumConstant.ONE_STR.equals(agencyScore.getValue().get(i).getIsTotal())) { // 是总分 总指数 = IS_TOTAL = 1 monthlyFormDTO.setIndexTotal(agencyScore.getValue().get(i).getScore()); } else {