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 eead853c83..771246610e 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 @@ -943,17 +943,19 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl lineChart(){ + String year = String.valueOf(LocalDate.now().getYear()); List lineChart = new ArrayList<>(); for (int i = NumConstant.ONE; i <= NumConstant.TWELVE; i++) { OrganizationalLifeLineChartDTO dto = new OrganizationalLifeLineChartDTO(); if (i < NumConstant.TEN){ - dto.setMonth(NumConstant.ZERO + String.valueOf(i) + "月"); + dto.setMonth(year +"-"+NumConstant.ZERO + String.valueOf(i)); }else { - dto.setMonth(String.valueOf(i) + "月"); + dto.setMonth(year +"-"+ String.valueOf(i) + "月"); } lineChart.add(dto); }