From 392a6963194dd4106591fa855697958c0fff5e59 Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Tue, 28 Sep 2021 12:05:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E6=97=B6?= =?UTF-8?q?=E6=AE=B5=E8=B4=B9=E7=8E=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/XhpcChargingPileMapper.xml | 2 +- .../src/main/resources/mapper/XhpcRateTimeMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml index 61efb2dc..02b65782 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -355,7 +355,7 @@ ct.name as chargingStationName, te.pile_serial_number as pileSerialNumber, cp.power as power, - cp.serial_number as serialNumber, + te.serial_number as serialNumber, cp.max_voltage as maxVoltage, te.status as status, te.work_status as workStatus diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml index 62ac099d..b3bca148 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml @@ -32,7 +32,7 @@ from xhpc_rate_time where charging_station_id = #{datchargingStationId} and start_time <= #{date} - and end_time >= #{date} + and replace(end_time, '00:00:00', '24:00:00') >= #{date} and status = 0 and del_flag = 0