From 5c12c5a4490898f20259e9de83767c4dadff10ba Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期二, 16 五月 2023 15:42:05 +0800
Subject: [PATCH] 1.根据区域进行模糊查询
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java
index 3fe62e0..d4c6d98 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java
@@ -6,8 +6,10 @@
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.your.entity.AddOil;
+import cn.exrick.xboot.your.entity.Car;
import cn.exrick.xboot.your.service.IAddOilService;
+import cn.exrick.xboot.your.service.ICarService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -42,6 +44,8 @@
@Autowired
private IAddOilService iAddOilService;
+ @Autowired
+ private ICarService iCarService;
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
@@ -84,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());
@@ -99,10 +103,10 @@
addOilList.add(new AddOil());
});
-
-
return new ResultUtil<List<AddOil>>().setData(addOilList);
}
+
+
@RequestMapping(value = "/getAll", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
@@ -125,6 +129,11 @@
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<AddOil> saveOrUpdate(AddOil addOil) {
+ if(StrUtil.isNotEmpty(addOil.getCarId())&&StrUtil.isEmpty(addOil.getAddOilCode())){
+ Car byId = iCarService.getById(addOil.getCarId());
+ addOil.setAddOilCode(byId.getAddOilCode());
+ }
+
if (iAddOilService.saveOrUpdate(addOil)) {
return new ResultUtil<AddOil>().setData(addOil);
}
--
Gitblit v1.9.1