From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 578a634..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);
--
Gitblit v1.9.3