From cfcb55d0559b59302564e3a26aa3f9936181da47 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 05 Jul 2022 17:16:16 +0800
Subject: [PATCH] 大屏接口对接

---
 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 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 11a101b..41c7ac5 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -157,4 +157,32 @@
 		return R.data(list);
 	}
 
+	/**
+	 * 大屏经营概况库存数量与年产量
+	 */
+	@GetMapping("/statisticsStockAndYield")
+	public R statisticsStockAndYield(String year,String deptId) {
+
+		//库存数量统计
+		Map map = new HashMap();
+		//统计当前库存农产品
+		Map<String, String> sum = farmProductStockService.statisticsStock(year, deptId);
+		//统计当前库存加工产品
+		Map<String, String> jgsum = null;
+		map.put("sum",sum.get("sum"));
+		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");
+		System.out.println("cscsc"+ncpNcl);
+		System.out.println(map.get("sum"));
+
+		map.put("ncpNcl",ncpNcl + Double.parseDouble(map.get("sum").toString()));
+
+		//加工产品年产量统计
+		map.put("jgNcl",0);
+		return R.data(map);
+	}
+
 }

--
Gitblit v1.9.3