From ef42cacddb804ed978b26ea3025596dee88b2a12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 26 十月 2024 10:17:02 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 1a968ba..f8ff260 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -804,7 +804,7 @@
// }
// Set<String> strings = map.keySet();
-
+ mongoChargingOrderQuery.setPageSize(2);
List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData();
List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
@@ -820,13 +820,16 @@
BeanUtils.copyProperties(chargingOrderVO, dataDto);
}
BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
-
+ dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
+ dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime());
dtos.add(dataDto);
}else {
continue;
}
}
-
+ for (int i = 0; i < dtos.size(); i++) {
+ dtos.get(i).setIndex(i);
+ }
return R.ok(dtos);
}
--
Gitblit v1.7.1