| | |
| | | @ApiOperation(value = "获取全部数据") |
| | | public Result<List<CarVo>> getAll(String beginTime,String endTime,PageVo page) { |
| | | List<CarVo> carVos = new ArrayList<>(); |
| | | |
| | | java.text.DecimalFormat df =new java.text.DecimalFormat("#.##"); |
| | | IPage<Car> list = iCarService.getAll2(PageUtil.initMpPage(page)); |
| | | for (Car car:list.getRecords()){ |
| | | CarVo carVo = new CarVo(); |
| | |
| | | AddOil addOil = iAddOilService.getOne(queryWrapper); |
| | | |
| | | if (addOil!=null){ |
| | | carVo.setMoney(addOil.getMoney()); |
| | | carVo.setOilWear(addOil.getAmount()); |
| | | carVo.setMoney(Double.parseDouble(df.format(addOil.getMoney()))); |
| | | carVo.setOilWear(Double.parseDouble(df.format(addOil.getAmount()))); |
| | | } |
| | | |
| | | if (drivingRecord!=null) { |