From 3ea77d7604b206373317f0c3927d03181f3f10ac Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 11 Jul 2022 15:08:24 +0800
Subject: [PATCH] noz管理
---
src/main/java/org/springblade/modules/stock/controller/StockController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 2055a3a..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")
@@ -235,7 +257,7 @@
*/
@GetMapping("/StockCount")
public R StockCount(String detpId) {
- List<Map<String, Object>> maps = stockService.StockCount(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 deptId,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(deptId,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();
--
Gitblit v1.9.3