From 90d61b2122cfc96779bb658ca6f28e86540de128 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 18 一月 2022 09:54:50 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
index f80b044..3bfd5bb 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java
+++ b/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;
}
}
--
Gitblit v1.9.1