diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java index 771246610e..12f800c8a9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java @@ -924,7 +924,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl lineChart = lineChart(); + List lineChart = lineChart(formDTO.getYearId()); if (!CollectionUtils.isEmpty(chartResult)){ Map> groupByMonth = chartResult.stream().collect(Collectors.groupingBy(OrganizationalLifeLineChartDTO::getMonth)); groupByMonth.forEach((month,list) -> { @@ -947,8 +947,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl lineChart(){ - String year = String.valueOf(LocalDate.now().getYear()); + public List lineChart(String yearId){ + String year = yearId.substring(NumConstant.ZERO,NumConstant.FOUR); List lineChart = new ArrayList<>(); for (int i = NumConstant.ONE; i <= NumConstant.TWELVE; i++) { OrganizationalLifeLineChartDTO dto = new OrganizationalLifeLineChartDTO();