Commit 5fc2edf6 authored by lisong's avatar lisong

更新

parent e4659da7
...@@ -102,6 +102,7 @@ public class AlertStatisticsServiceImpl extends BaseService<AlertStatisticsDto, ...@@ -102,6 +102,7 @@ public class AlertStatisticsServiceImpl extends BaseService<AlertStatisticsDto,
} }
statistics.setSupervisoryUnitName("合计"); statistics.setSupervisoryUnitName("合计");
statistics.setSequenceNbr(0L);
DecimalFormat decimalFormat = new DecimalFormat("0.000"); DecimalFormat decimalFormat = new DecimalFormat("0.000");
DecimalFormat decimalFormatAvg = new DecimalFormat("0.0"); DecimalFormat decimalFormatAvg = new DecimalFormat("0.0");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
...@@ -117,6 +118,7 @@ public class AlertStatisticsServiceImpl extends BaseService<AlertStatisticsDto, ...@@ -117,6 +118,7 @@ public class AlertStatisticsServiceImpl extends BaseService<AlertStatisticsDto,
alertStatistics.add(statistics); alertStatistics.add(statistics);
AlertStatistics avg = new AlertStatistics(); AlertStatistics avg = new AlertStatistics();
avg.setSupervisoryUnitName("平均每天"); avg.setSupervisoryUnitName("平均每天");
avg.setSequenceNbr(1L);
long days = DateUtil.betweenDay(simpleDateFormat.parse(startDate), simpleDateFormat.parse(endDate), true); long days = DateUtil.betweenDay(simpleDateFormat.parse(startDate), simpleDateFormat.parse(endDate), true);
int avgNum = Integer.parseInt(String.valueOf(days)); int avgNum = Integer.parseInt(String.valueOf(days));
if (!ObjectUtils.isEmpty(statistics.getEmergencyEvents()) && statistics.getEmergencyEvents() != 0 && avgNum != 0) { if (!ObjectUtils.isEmpty(statistics.getEmergencyEvents()) && statistics.getEmergencyEvents() != 0 && avgNum != 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment