Commit eefa9627 authored by jiaorz's avatar jiaorz

预订时间处理bug

parent 522e7ccb
...@@ -175,16 +175,18 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V ...@@ -175,16 +175,18 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
List<VehicleBookHourInfo> vehicleBookHourInfoList = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto); List<VehicleBookHourInfo> vehicleBookHourInfoList = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
log.info("获取到的小时信息: vehicleBookHourInfoList = {}", vehicleBookHourInfoList); log.info("获取到的小时信息: vehicleBookHourInfoList = {}", vehicleBookHourInfoList);
if(CollectionUtils.isNotEmpty(vehicleBookHourInfoList)) { if(CollectionUtils.isNotEmpty(vehicleBookHourInfoList)) {
if(entry.getValue() == 0){ //0点
vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() | 1);
updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
} else {
if((vehicleBookHourInfoList.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) { if((vehicleBookHourInfoList.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
log.info("已经预订时间正确,右移一位,原数据为:{}, 修改后的数据为: {}", vehicleBookHourInfoList.get(0).getBookedHour(), vehicleBookHourInfoList.get(0).getBookedHour() >> 1); log.info("已经预订时间正确,右移一位,原数据为:{}, 修改后的数据为: {}", vehicleBookHourInfoList.get(0).getBookedHour(), vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() >> 1); vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
updateSelectiveByIdRe(vehicleBookHourInfoList.get(0)); updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
} else if(entry.getValue() == 0){ //0点
vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() | 1);
updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
} else { } else {
vehicleBookHourInfos.add(vehicleBookRecord); vehicleBookHourInfos.add(vehicleBookRecord);
} }
}
} else { //如果数据不存在就补充进去 } else { //如果数据不存在就补充进去
VehicleBookHourInfoDto vehicleBookHourInfoDto1 = new VehicleBookHourInfoDto(); VehicleBookHourInfoDto vehicleBookHourInfoDto1 = new VehicleBookHourInfoDto();
vehicleBookHourInfoDto1.setVehicleId(vehicleBookRecord.getVehicleId()); vehicleBookHourInfoDto1.setVehicleId(vehicleBookRecord.getVehicleId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment