|
@@ -852,21 +852,33 @@ public class IotRdDailyReportController {
|
|
|
// 循环遍历 获取 每个 维度 工作量的值
|
|
// 循环遍历 获取 每个 维度 工作量的值
|
|
|
if ("cumulativeBridgePlug".equals(stat.getDeptName())) {
|
|
if ("cumulativeBridgePlug".equals(stat.getDeptName())) {
|
|
|
resultMap.put("cumulativeBridgePlug", stat.getCumulativeBridgePlug());
|
|
resultMap.put("cumulativeBridgePlug", stat.getCumulativeBridgePlug());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resultMap.put("cumulativeBridgePlug", BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
if ("cumulativeRunCount".equals(stat.getDeptName())) {
|
|
if ("cumulativeRunCount".equals(stat.getDeptName())) {
|
|
|
resultMap.put("cumulativeRunCount", stat.getCumulativeRunCount());
|
|
resultMap.put("cumulativeRunCount", stat.getCumulativeRunCount());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resultMap.put("cumulativeRunCount", BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
if ("cumulativeWorkingWell".equals(stat.getDeptName())) {
|
|
if ("cumulativeWorkingWell".equals(stat.getDeptName())) {
|
|
|
resultMap.put("cumulativeWorkingWell", stat.getCumulativeWorkingWell());
|
|
resultMap.put("cumulativeWorkingWell", stat.getCumulativeWorkingWell());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resultMap.put("cumulativeWorkingWell", BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
if ("cumulativeHourCount".equals(stat.getDeptName())) {
|
|
if ("cumulativeHourCount".equals(stat.getDeptName())) {
|
|
|
resultMap.put("cumulativeHourCount", stat.getCumulativeHourCount());
|
|
resultMap.put("cumulativeHourCount", stat.getCumulativeHourCount());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resultMap.put("cumulativeHourCount", BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
if ("cumulativeWaterVolume".equals(stat.getDeptName())) {
|
|
if ("cumulativeWaterVolume".equals(stat.getDeptName())) {
|
|
|
resultMap.put("cumulativeWaterVolume", stat.getCumulativeWaterVolume());
|
|
resultMap.put("cumulativeWaterVolume", stat.getCumulativeWaterVolume());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resultMap.put("cumulativeWaterVolume", BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
if ("cumulativeWorkingLayers".equals(stat.getDeptName())) {
|
|
if ("cumulativeWorkingLayers".equals(stat.getDeptName())) {
|
|
|
resultMap.put("cumulativeWorkingLayers", stat.getCumulativeWorkingLayers());
|
|
resultMap.put("cumulativeWorkingLayers", stat.getCumulativeWorkingLayers());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resultMap.put("cumulativeWorkingLayers", BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
if ("cumulativeMixSand".equals(stat.getDeptName())) {
|
|
if ("cumulativeMixSand".equals(stat.getDeptName())) {
|
|
|
taici[0] = taici[0].add(stat.getCumulativeMixSand());
|
|
taici[0] = taici[0].add(stat.getCumulativeMixSand());
|
|
@@ -877,6 +889,8 @@ public class IotRdDailyReportController {
|
|
|
resultMap.put("taici", taici[0]);
|
|
resultMap.put("taici", taici[0]);
|
|
|
if ("cumulativeFuels".equals(stat.getDeptName())) {
|
|
if ("cumulativeFuels".equals(stat.getDeptName())) {
|
|
|
resultMap.put("cumulativeFuels", stat.getTotalDailyFuel());
|
|
resultMap.put("cumulativeFuels", stat.getTotalDailyFuel());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ resultMap.put("cumulativeFuels", BigDecimal.ZERO);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|