From 77dd7d19bb13f19acd273ba92dfd2b866a229c5e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 16 Jul 2022 16:20:07 +0800
Subject: [PATCH] 库存
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 f056e7e..a8b1040 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -180,14 +180,20 @@
Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
//统计当前库存加工产品
Map<String, String> jgsum = null;
- map.put("sum",sum.get("sum"));
+ if (sum != null){
+ map.put("sum",sum.get("sum"));
+ map.put("ncpNcl", sum.get("cssum"));
+ }else{
+ map.put("sum",0);
+ map.put("ncpNcl",0);
+ }
map.put("jgsum",0);
//农产品年产量统计
// List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
// double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");
- map.put("ncpNcl", sum.get("cssum"));
+
//加工产品年产量统计
map.put("jgNcl",0);
@@ -199,11 +205,11 @@
* 按月份统计产量
*/
@GetMapping("/statisticsStockMonth")
- public R statisticsStockMonth(String year,String deptId) {
+ public R statisticsStockMonth(String year,String farmId) {
//采收数量统计
Map map = new HashMap();
- List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
+ List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, farmId);
//加工产品数量统计
Map<String, String> jgsum = null;
--
Gitblit v1.9.3