From 07040356988b4be6423e8b92649da68ad3a5a579 Mon Sep 17 00:00:00 2001 From: xjm Date: Thu, 14 Nov 2024 16:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=9F=B9=E8=AE=AD=E6=9C=9F?= =?UTF-8?q?=E6=95=B0/=E4=BA=BA=E6=AC=A1=E8=AE=A1=E7=AE=97=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/PersonnelPlanLogController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java index 64d8363..855e681 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java @@ -166,10 +166,11 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ Calendar calendar = Calendar.getInstance(); + int month = calendar.get(Calendar.MONTH) + 1; if (CollectionUtils.isNotEmpty(planLogs)) { vo.setNumberOfPeriods1(planLogs.size()); vo.setPersonNum1(planLogs.stream().mapToInt(PersonnelPlanLog::getNumPeople).sum()); - for (int i = 1; i <= 12; i++) { + for (int i = 1; i <= month; i++) { PersonnelPlanLogStatisticsVo.EchartsData echartsData1 = map1.get(i); PersonnelPlanLogStatisticsVo.EchartsData echartsData2 = map2.get(i); @@ -184,7 +185,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ .filter(item -> { calendar.setTime(item.getPlanDate()); - return calendar.get(Calendar.MONTH) + 1 == finalI; + return month == finalI; }) .toList(); @@ -202,7 +203,8 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ if (CollectionUtils.isNotEmpty(plans)) { vo.setNumberOfPeriods2(plans.stream().mapToInt(PersonnelPlan::getNum).sum()); vo.setPersonNum2(plans.stream().mapToInt(PersonnelPlan::getNumPeople).sum()); - for (int i = 1; i <= 12; i++) { + + for (int i = 1; i <= month; i++) { PersonnelPlanLogStatisticsVo.EchartsData echartsData1 = map1.get(i); if (Objects.isNull(echartsData1)) { echartsData1 = new PersonnelPlanLogStatisticsVo.EchartsData(); @@ -216,7 +218,7 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{ .filter(item -> { calendar.setTime(item.getStm()); - return calendar.get(Calendar.MONTH) + 1 == finalI; + return month == finalI; }).toList(); echartsData1.setMonth(finalI)