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