From 4f79eb01bbe0132a6d7bf999bf34bd14cdbc8425 Mon Sep 17 00:00:00 2001 From: andy <1042025947@qq.com> Date: Fri, 9 May 2025 13:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=B9=E7=94=A8=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BatteryStationHdFeeStandardMapper.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cloud-manage-server/src/main/resources/mapper/BatteryStationHdFeeStandardMapper.xml b/cloud-manage-server/src/main/resources/mapper/BatteryStationHdFeeStandardMapper.xml index 6bb7dcf..2dfdf1e 100644 --- a/cloud-manage-server/src/main/resources/mapper/BatteryStationHdFeeStandardMapper.xml +++ b/cloud-manage-server/src/main/resources/mapper/BatteryStationHdFeeStandardMapper.xml @@ -40,8 +40,8 @@ where a.station_code = #{stationCode} - and DATE_FORMAT(a.day_begin,'%m-%d') <=DATE_FORMAT(#{day},'%m-%d') - and DATE_FORMAT(a.day_end,'%m-%d') >= DATE_FORMAT(#{day},'%m-%d') + and (DATE_FORMAT(a.day_begin,'%m-%d') <=DATE_FORMAT(#{day},'%m-%d') or DATE_FORMAT(CONCAT(YEAR(CURRENT_DATE),a.day_begin),'%m-%d') <=DATE_FORMAT(#{day},'%m-%d')) + and (DATE_FORMAT(a.day_end,'%m-%d') >= DATE_FORMAT(#{day},'%m-%d') or DATE_FORMAT(CONCAT(YEAR(CURRENT_DATE),a.day_end),'%m-%d') >= DATE_FORMAT(#{day},'%m-%d')) order by a.pk_id desc @@ -53,7 +53,8 @@ yt_t_battery_station_hd_fee_standard a where a.station_code = #{stationCode} - and DATE_FORMAT(a.day_end,'%m-%d') <= DATE_FORMAT(#{day},'%m-%d') + and (DATE_FORMAT(a.day_end, '%m-%d') <= DATE_FORMAT(#{day}, '%m-%d') + or DATE_FORMAT(CONCAT(YEAR(CURRENT_DATE),a.day_end),'%m-%d') <= DATE_FORMAT(#{day},'%m-%d')) order by a.day_end desc limit 1 @@ -65,7 +66,8 @@ yt_t_battery_station_hd_fee_standard a where a.station_code = #{stationCode} - and DATE_FORMAT(a.day_begin,'%m-%d') >=DATE_FORMAT(#{day},'%m-%d') + and (DATE_FORMAT(a.day_begin,'%m-%d') >=DATE_FORMAT(#{day},'%m-%d') + or DATE_FORMAT(CONCAT(YEAR(CURRENT_DATE),a.day_begin),'%m-%d') >=DATE_FORMAT(#{day},'%m-%d')) order by a.day_begin asc limit 1