From a29360f67fc9494064ae8658a8085f7d64b05c3b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 20:39:49 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml | 16 +++++-----------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 2 +-
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
index 0cc1dbf..7b17c17 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
@@ -124,7 +124,7 @@
s2 = query.getTimePeriod().split(" - ")[1];
}
Page<TParkingRecord> page = parkingRecordService.lambdaQuery()
- .in(TParkingRecord::getParkingLotId,ids)
+ .in(null != ids && ids.size() > 0, TParkingRecord::getParkingLotId,ids)
.like(query.getLicensePlate() != null, TParkingRecord::getLicensePlate, query.getLicensePlate())
.eq(query.getStatus() != null, TParkingRecord::getStatus, query.getStatus())
.eq(query.getOutParkingType() != null, TParkingRecord::getOutParkingType, query.getOutParkingType())
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
index 10ab1ad..7f5757b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
@@ -98,8 +98,8 @@
<select id="parkingData" resultType="java.util.Map">
SELECT
DATE_FORMAT( t1.create_time, '%H:00' ) AS time,
- count( 1 ) AS orders,
- SUM( t1.timeout_amount ) AS timeoutAmount
+ count( 1 ) AS orders,
+ SUM( t1.timeout_amount ) AS timeoutAmount
FROM
t_parking_record t1
left join t_parking_lot t2 on t2.id = t1.parking_lot_id
@@ -121,8 +121,8 @@
<select id="parkingDataByDate" resultType="java.util.Map">
SELECT
DATE_FORMAT( t1.create_time, '%Y-%m-%d' ) AS time,
- count( 1 ) AS orders,
- SUM( t1.timeout_amount ) AS timeoutAmount
+ count( 1 ) AS orders,
+ SUM( t1.timeout_amount ) AS timeoutAmount
FROM
t_parking_record t1
left join t_parking_lot t2 on t2.id = t1.parking_lot_id
@@ -155,12 +155,7 @@
</foreach>
</if>
</where>
- GROUP BY
- time
- ORDER BY
- time
-
-
+ GROUP BY time
</select>
<select id="getCarColor" resultType="java.util.Map">
SELECT
@@ -168,7 +163,6 @@
FROM
t_parking_record t1
left join t_parking_lot t2 on t2.id = t1.parking_lot_id
-
<where>
<if test="parkingRecordQueryDto.parkingLotId !=null">
AND t1.parking_lot_id = #{parkingRecordQueryDto.parkingLotId}
--
Gitblit v1.7.1