xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java
@@ -88,12 +88,12 @@ addOilList.add(addOil); } AddOil addOil = new AddOil(); java.text.DecimalFormat df =new java.text.DecimalFormat("#.00"); java.text.DecimalFormat df =new java.text.DecimalFormat("#.##"); addOil.setCarNo("合计"); addOil.setAmount(value.stream().map(e -> e.getAmount()).reduce(Double::sum).get()); addOil.setAmount(Double.parseDouble(df.format(value.stream().map(e -> e.getAmount()).reduce(Double::sum).get()))); addOil.setMileage(value.stream().map(e -> e.getMileage()).reduce(Integer::sum).get()); addOil.setMoney(value.stream().map(e -> e.getMoney()).reduce(Double::sum).get()); addOil.setMoney(Double.parseDouble(df.format(value.stream().map(e -> e.getMoney()).reduce(Double::sum).get()))); Double f = addOil.getAmount()/addOil.getMileage()*100; BigDecimal b = new BigDecimal(f); addOil.setOilWear(b.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()); xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
@@ -115,6 +115,8 @@ @RequestMapping(value = "/getInfo", method = RequestMethod.GET) @ApiOperation(value = "通过车辆id获取") public Result<List<Car>> getInfo(String beginTime,String endTime) { java.text.DecimalFormat df =new java.text.DecimalFormat("#.##"); QueryWrapper<Car> wrapper = new QueryWrapper<>(); wrapper.ge(beginTime!=null && beginTime!="","a.add_date",beginTime); wrapper.le(endTime!=null && endTime!="","a.add_date",endTime); @@ -124,9 +126,12 @@ for (Car car:list2){ for (Car car1:list){ if (car.getId().equals(car1.getId())){ car1.setAmount(car.getAmount()); car1.setMileage(car.getMileage()); car1.setMoney(car.getMoney()); car1.setAmount(Double.parseDouble(df.format(car.getAmount()))); car1.setMileage(Double.parseDouble(df.format(car.getMileage()))); car1.setMoney(Double.parseDouble(df.format(car.getMoney()))); car1.setAllAmount(Double.parseDouble(df.format(car1.getAllAmount()))); car1.setAllMileage(Double.parseDouble(df.format(car1.getAllMileage()))); car1.setAllMoney(Double.parseDouble(df.format(car1.getAllMoney()))); continue; } }
