Commit c1f55c97 authored by caotao's avatar caotao

车辆统计优化里程

parent 461a96c0
...@@ -1864,14 +1864,15 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS ...@@ -1864,14 +1864,15 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
MileageDto mileageDto = new MileageDto(); MileageDto mileageDto = new MileageDto();
Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDate(date, list.get(i).getIotCode()); Double totalTravel = iWlCarMileageService.getTotalTravelByIotCodeAndDate(date, list.get(i).getIotCode());
mileageDto.setCarNum(list.get(i).getCarNum()); mileageDto.setCarNum(list.get(i).getCarNum());
mileageDto.setCarCode(list.get(i).getCode()); mileageDto.setCarCode(list.get(i).getRemark());
mileageDto.setIotCode(date + "::" + list.get(i).getIotCode()); mileageDto.setIotCode(date + "::" + list.get(i).getIotCode());
mileageDto.setTotal(carMaxTravel+"KM");
if (totalTravel != null) { if (totalTravel != null) {
mileageDto.setTotalTravel((totalTravel / carMaxTravel) * 100); mileageDto.setTotalTravel((totalTravel / carMaxTravel) * 100);
} else { } else {
mileageDto.setTotalTravel(0.0); totalTravel= 0.0;
mileageDto.setTotalTravel(totalTravel);
} }
mileageDto.setTotal(totalTravel+"KM");
mileageDtoList.add(mileageDto); mileageDtoList.add(mileageDto);
} }
} }
......
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