From 7abdd3ba7fa34c059f3c867e366d1a2137ae702f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 14 Jul 2022 17:08:24 +0800
Subject: [PATCH] kuc管理
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
index 894cf67..f056e7e 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -172,12 +172,12 @@
* 大屏经营概况库存数量与年产量
*/
@GetMapping("/statisticsStockAndYield")
- public R statisticsStockAndYield(String year,String deptId) {
+ public R statisticsStockAndYield(String year,String farmId) {
//库存数量统计
Map map = new HashMap();
//统计当前库存农产品
- Map<String, String> sum = farmProductStockService.statisticsStock(year, deptId);
+ Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
//统计当前库存加工产品
Map<String, String> jgsum = null;
map.put("sum",sum.get("sum"));
@@ -203,7 +203,7 @@
//采收数量统计
Map map = new HashMap();
- Map<String, String> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
+ List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
//加工产品数量统计
Map<String, String> jgsum = null;
@@ -214,9 +214,9 @@
* 农产品监管
*/
@GetMapping("/productsSupervise")
- public R productsSupervise(String year,String deptId) {
+ public R productsSupervise(String year,String farmId) {
- Map<String, String> cssum = farmProductStockService.productsSupervise(year, deptId);
+ Map<String, String> cssum = farmProductStockService.productsSupervise(year, farmId);
return R.data(cssum);
}
--
Gitblit v1.9.3