From bada5213f95ef51ecd76cbe7b42eec5a84c62651 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Wed, 20 Jul 2022 10:46:56 +0800
Subject: [PATCH] 首页农资入库数量统计 传入参数，之前是写死的值
---
src/main/java/org/springblade/modules/stock/controller/StockController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index 29d331c..8b81c03 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -41,6 +41,7 @@
import org.springblade.modules.stock.service.IStockService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
@@ -245,7 +246,6 @@
double v1 = lycknum + dbcknum + bfcknum;
pages.getRecords().get(i).setCknum(v1);
}
-
return R.data(pages);
}
@@ -257,7 +257,7 @@
*/
@GetMapping("/StockCount")
public R StockCount(String detpId) {
- List<Map<String, Object>> maps = stockService.StockCount("1123598813738675201");
+ List<Map<String, Object>> maps = stockService.StockCount(detpId);
//化肥0
double hf = 0;
//有机肥1
@@ -427,19 +427,19 @@
}
Map map = new HashMap();
map.put("name", "化肥");
- map.put("val", hf);
+ map.put("val", new BigDecimal(hf).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map1 = new HashMap();
map1.put("name", "有机肥");
- map1.put("val", yjf);
+ map1.put("val", new BigDecimal(String.valueOf(yjf)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map2 = new HashMap();
map2.put("name", "杀虫剂");
- map2.put("val", scj);
+ map2.put("val", new BigDecimal(String.valueOf(scj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map3 = new HashMap();
map3.put("name", "杀菌剂");
- map3.put("val", sjj);
+ map2.put("val", new BigDecimal(String.valueOf(sjj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map4 = new HashMap();
map4.put("name", "饲料");
- map4.put("val", sl);
+ map2.put("val", new BigDecimal(String.valueOf(sl)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
List list = new ArrayList();
list.add(map);
list.add(map1);
--
Gitblit v1.9.3