diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java index 8580503f88..a1031a9494 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java @@ -158,7 +158,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { public List getXPro(){ List xAxis = new ArrayList<>(); LocalDate today = LocalDate.now(); - for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){ + for(int i = NumConstant.ELEVEN;i >= NumConstant.ZERO; i--){ LocalDate localDate = today.minusMonths(i); String s = localDate.getMonth().getValue() + ScreenConstant.MONTH; xAxis.add(s); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml index 0b2e8698e2..a484d4549a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml @@ -6,7 +6,7 @@