From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改
---
src/main/java/org/springblade/modules/stock/controller/StockController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 92806a5..85c9ab5 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;
@@ -153,6 +154,7 @@
stockrecord.setSpecs1(stock.getSpecs());
stockrecord.setSpecsVal1(stock.getSpecsValue1());
stockrecord.setSpecsVal2(stock.getSpecsValue2());
+ stockrecord.setDeptId(stock.getDeptId());
stockrecord.setSp1("stockSpecs1");
stockrecord.setSp2("stockSpecs2");
//统计公斤
@@ -245,7 +247,6 @@
double v1 = lycknum + dbcknum + bfcknum;
pages.getRecords().get(i).setCknum(v1);
}
-
return R.data(pages);
}
@@ -256,8 +257,8 @@
* @return
*/
@GetMapping("/StockCount")
- public R StockCount(String detpId) {
- List<Map<String, Object>> maps = stockService.StockCount("1123598813738675201");
+ public R StockCount(String deptId) {
+ List<Map<String, Object>> maps = stockService.StockCount(deptId);
//化肥0
double hf = 0;
//有机肥1
@@ -427,19 +428,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);
+ map3.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);
+ map4.put("val", new BigDecimal(String.valueOf(sl)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
List list = new ArrayList();
list.add(map);
list.add(map1);
@@ -495,7 +496,7 @@
* @param query
* @return
*/
- @PostMapping("/pagenums")
+ @GetMapping("/pagenums")
public R pagenums(StocksVO stock, Query query) {
Double rknu = 0.0;
Double cknu = 0.0;
--
Gitblit v1.9.3