From b880058e6ded5169ed38bb214d2da3b841d51bdd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 14 三月 2025 16:27:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
index 06eda65..25bf750 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
@@ -33,6 +33,7 @@
import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -180,7 +181,7 @@
@PostMapping(value = "/getRecordAmount")
- public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") LocalDate sixBefore){
+ public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") String sixBefore){
BigDecimal sum = parkingRecordService.getSum(sixBefore);
return R.ok(sum);
}
@@ -201,7 +202,18 @@
R<Integer> getSiteIdByOrderId(@RequestParam("id") Long id){
TParkingRecord byId = parkingRecordService.getById(id);
TParkingLot parkingLot = parkingLotService.getById(byId.getParkingLotId());
- return R.ok(parkingLot.getId());
+ return R.ok(parkingLot.getSiteId());
+ }
+ @PostMapping(value = "/getSiteIdAll")
+ R<List<TParkingRecord>> getSiteIdAll(){
+ List<TParkingRecord> list = parkingRecordService.list();
+ for (TParkingRecord tParkingRecord : list) {
+ TParkingLot parkingLot = parkingLotService.getById(tParkingRecord.getParkingLotId());
+ if (parkingLot!=null){
+ tParkingRecord.setSiteId(parkingLot.getSiteId());
+ }
+ }
+ return R.ok(list);
}
}
--
Gitblit v1.7.1