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 9a44da87ea..8fedb2b70b 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 @@ -910,7 +910,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) -> { @@ -933,8 +933,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();