|
|
@@ -266,6 +266,15 @@ public class IotRdDailyReportController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 查询当前日报的关联油耗
|
|
|
+ IotDailyReportFuelPageReqVO reportedFuelReqVO = new IotDailyReportFuelPageReqVO();
|
|
|
+ reportedFuelReqVO.setType("RD");
|
|
|
+ reportedFuelReqVO.setReportId(dailyReport.getId());
|
|
|
+ List<IotDailyReportFuelDO> reportedFuels = iotDailyReportFuelService.getIotDailyReportFuels(reportedFuelReqVO);
|
|
|
+ if (CollUtil.isNotEmpty(reportedFuels)) {
|
|
|
+ dailyReportVO.setReportedFuels(reportedFuels);
|
|
|
+ }
|
|
|
+
|
|
|
if (CollUtil.isNotEmpty(reportedFuelsPair)) {
|
|
|
hasFuels = true;
|
|
|
reportedFuelsPair.forEach((reportId, fuels) -> {
|