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