From f7d78efa1d02b1bd089b1ad65e5b8758b2377f0b Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 31 May 2021 12:04:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java index 1476600147..328a3d1a1c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java @@ -86,7 +86,7 @@ public class ScreenUserJoinServiceImpl extends BaseServiceImpl lastMonthJoinList.size()){ + if (i >= lastMonthJoinList.size()){ lastJoinEntity = new ScreenUserJoinEntity(); lastJoinEntity.setJoinTotal(NumConstant.ZERO); lastJoinEntity.setAvgIssue(NumConstant.ZERO_DECIMAL); From cd34ec78f6c9fbcaaf89b6a0ea8c4442c266f1c7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 31 May 2021 14:05:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E4=B9=8B=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0697a46edd..1a9b76f055 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 @@ -118,7 +118,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { if (!CollectionUtils.isEmpty(customerIds)) { customerIds.forEach(customerId -> { if (StringUtils.isNotBlank(formDTO.getStartMonth()) && StringUtils.isNotBlank(formDTO.getEndMonth())) { - List daysBetween = DateUtils.getMonthBetween(formDTO.getStartDate(), formDTO.getEndDate()); + List daysBetween = DateUtils.getMonthBetween(formDTO.getStartMonth(), formDTO.getEndMonth()); daysBetween.forEach(monthId -> { extractMonthly(customerId, monthId); });