From 3efd7f01cba4aaa09f75662e287bfa4c780990cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 16:22:05 +0800
Subject: [PATCH] 地块id添加
---
src/main/java/org/springblade/modules/stock/controller/StockController.java | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 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 5c1c764..92806a5 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -107,6 +107,28 @@
}
/**
+ * 自定义分页 农资库存表
+ */
+ @GetMapping("/pages")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入stock")
+ public R<List<StockVO>> pages(StockVO stock) {
+ List<StockVO> pages = stockService.selectListss(stock);
+ for (int i = 0; i < pages.size(); i++) {
+ String specs = pages.get(i).getSpecs();
+ Integer amount = pages.get(i).getAmount();
+ Integer num = Integer.parseInt(specs);
+ String dic1 = pages.get(i).getDic1();
+ String dic2 = pages.get(i).getDic2();
+ String s = specs + dic1 + "/" + dic2;
+ pages.get(i).setSpn(s);
+ pages.get(i).setCnum(num * amount);
+
+ }
+ return R.data(pages);
+ }
+
+ /**
* 新增 农资库存表
*/
@PostMapping("/save")
@@ -233,9 +255,9 @@
*
* @return
*/
- @PostMapping("/StockCount")
- public R StockCount() {
- List<Map<String, Object>> maps = stockService.StockCount();
+ @GetMapping("/StockCount")
+ public R StockCount(String detpId) {
+ List<Map<String, Object>> maps = stockService.StockCount("1123598813738675201");
//化肥0
double hf = 0;
//有机肥1
@@ -434,10 +456,10 @@
* @return
*/
@GetMapping("/pagenumx")
- public R pagenumx(String startTime, String endTime) {
+ public R pagenumx(String deptId, String startTime, String endTime) {
Double rknu = 0.0;
Double cknu = 0.0;
- List<StocksVO> pages = stockService.slectNumx(startTime, endTime);
+ List<StocksVO> pages = stockService.slectNumx(deptId, startTime, endTime);
for (int i = 0; i < pages.size(); i++) {
Double cgnum = pages.get(i).getCgnum();
Double dbrknum = pages.get(i).getDbrknum();
@@ -455,16 +477,59 @@
rknu += rknum;
cknu += cknum;
}
- Map map= new HashMap();
- DecimalFormat df = new DecimalFormat("#0.00");
+ Map map = new HashMap();
+ DecimalFormat df = new DecimalFormat("#0.000");
String format = df.format(rknu);
Double a = Double.parseDouble(format);
String format1 = df.format(cknu);
double b = Double.parseDouble(format1);
- map.put("rknum",a);
- map.put("cknum",b);
+ map.put("rknum", a);
+ map.put("cknum", b);
return R.data(map);
}
+ /**
+ * 小程序农资数据统计详情
+ *
+ * @param stock
+ * @param query
+ * @return
+ */
+ @PostMapping("/pagenums")
+ public R pagenums(StocksVO stock, Query query) {
+ Double rknu = 0.0;
+ Double cknu = 0.0;
+ IPage<StocksVO> pages = stockService.slectNum(Condition.getPage(query), stock);
+ for (int i = 0; i < pages.getRecords().size(); i++) {
+ Double cgnum = pages.getRecords().get(i).getCgnum();
+ Double dbrknum = pages.getRecords().get(i).getDbrknum();
+ double v = cgnum + dbrknum;
+ pages.getRecords().get(i).setRknum(v);
+ Double lycknum = pages.getRecords().get(i).getLycknum();
+ Double dbcknum = pages.getRecords().get(i).getDbcknum();
+ Double bfcknum = pages.getRecords().get(i).getBfcknum();
+ double v1 = lycknum + dbcknum + bfcknum;
+ pages.getRecords().get(i).setCknum(v1);
+ }
+ for (int j = 0; j < pages.getRecords().size(); j++) {
+ Double rknum = pages.getRecords().get(j).getRknum();
+ Double cknum = pages.getRecords().get(j).getCknum();
+ rknu += rknum;
+ cknu += cknum;
+ }
+ Map map = new HashMap();
+ DecimalFormat df = new DecimalFormat("#0.000");
+ String format = df.format(rknu);
+ Double a = Double.parseDouble(format);
+ String format1 = df.format(cknu);
+ double b = Double.parseDouble(format1);
+ map.put("rknum", a);
+ map.put("cknum", b);
+ List list = new ArrayList();
+ list.add(map);
+ list.add(pages);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3