zouyx 2 years ago
parent
commit
ce78689a3c
  1. 12
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java

12
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())) { if(sip.getMonth()!=null&&!"".equals(sip.getMonth())) {
LocalDate beginTime=localDate.minusMonths(1).withDayOfMonth(1); LocalDate beginTime=localDate.minusMonths(1).withDayOfMonth(1);
LocalDate endTime = localDate.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth()); LocalDate endTime = localDate.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
sip.setBeginTime(str.format(beginTime)); statisticsIndicatorPart.setBeginTime(str.format(beginTime));
sip.setEndTime(str.format(endTime)); statisticsIndicatorPart.setEndTime(str.format(endTime));
}else if(sip.getQuarter()!=null&&!"".equals(sip.getQuarter())){ }else if(sip.getQuarter()!=null&&!"".equals(sip.getQuarter())){
localDate=localDate.minusMonths(3); localDate=localDate.minusMonths(3);
int quarter=(int)Math.ceil(Double.valueOf(str3.format(localDate))/3); int quarter=(int)Math.ceil(Double.valueOf(str3.format(localDate))/3);
LocalDate beginTime=localDate.withMonth(quarter*3-2).withDayOfMonth(1); LocalDate beginTime=localDate.withMonth(quarter*3-2).withDayOfMonth(1);
LocalDate endTime=localDate.withMonth(quarter*3).with(TemporalAdjusters.lastDayOfMonth()); LocalDate endTime=localDate.withMonth(quarter*3).with(TemporalAdjusters.lastDayOfMonth());
sip.setBeginTime(str.format(beginTime)); statisticsIndicatorPart.setBeginTime(str.format(beginTime));
sip.setEndTime(str.format(endTime)); statisticsIndicatorPart.setEndTime(str.format(endTime));
}else { }else {
LocalDate beginTime=localDate.minusYears(1).withMonth(1).withDayOfMonth(1); LocalDate beginTime=localDate.minusYears(1).withMonth(1).withDayOfMonth(1);
LocalDate endTime=localDate.minusYears(1).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); LocalDate endTime=localDate.minusYears(1).withMonth(12).with(TemporalAdjusters.lastDayOfMonth());
sip.setBeginTime(str.format(beginTime)); statisticsIndicatorPart.setBeginTime(str.format(beginTime));
sip.setEndTime(str.format(endTime)); statisticsIndicatorPart.setEndTime(str.format(endTime));
} }
return statisticsIndicatorPart; return statisticsIndicatorPart;
} }

Loading…
Cancel
Save