diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java index 8c814d12..c5b45b13 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java @@ -405,20 +405,20 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService { if(sip.getMonth()!=null&&!"".equals(sip.getMonth())) { LocalDate beginTime=localDate.minusMonths(1).withDayOfMonth(1); LocalDate endTime = localDate.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth()); - sip.setBeginTime(str.format(beginTime)); - sip.setEndTime(str.format(endTime)); + statisticsIndicatorPart.setBeginTime(str.format(beginTime)); + statisticsIndicatorPart.setEndTime(str.format(endTime)); }else if(sip.getQuarter()!=null&&!"".equals(sip.getQuarter())){ localDate=localDate.minusMonths(3); int quarter=(int)Math.ceil(Double.valueOf(str3.format(localDate))/3); LocalDate beginTime=localDate.withMonth(quarter*3-2).withDayOfMonth(1); LocalDate endTime=localDate.withMonth(quarter*3).with(TemporalAdjusters.lastDayOfMonth()); - sip.setBeginTime(str.format(beginTime)); - sip.setEndTime(str.format(endTime)); + statisticsIndicatorPart.setBeginTime(str.format(beginTime)); + statisticsIndicatorPart.setEndTime(str.format(endTime)); }else { LocalDate beginTime=localDate.minusYears(1).withMonth(1).withDayOfMonth(1); LocalDate endTime=localDate.minusYears(1).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); - sip.setBeginTime(str.format(beginTime)); - sip.setEndTime(str.format(endTime)); + statisticsIndicatorPart.setBeginTime(str.format(beginTime)); + statisticsIndicatorPart.setEndTime(str.format(endTime)); } return statisticsIndicatorPart; }