From f32d0dfb10154007d6e51063b7567a604922a9f9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 18:34:16 +0800
Subject: [PATCH] 大屏接口对接

---
 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java |   24 +++++++++++++++++++-----
 1 files changed, 19 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 41c7ac5..1c039c1 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -173,16 +173,30 @@
 		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"));
+//		List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
+//		double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");
 
-		map.put("ncpNcl",ncpNcl + Double.parseDouble(map.get("sum").toString()));
+		map.put("ncpNcl", sum.get("cssum"));
 
 		//加工产品年产量统计
 		map.put("jgNcl",0);
 		return R.data(map);
 	}
 
+
+	/**
+	 * 按月份统计产量
+	 */
+	@GetMapping("/statisticsStockMonth")
+	public R statisticsStockMonth(String year,String deptId) {
+
+		//采收数量统计
+		Map map = new HashMap();
+		Map<String, String> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
+		//加工产品数量统计
+		Map<String, String> jgsum = null;
+
+		return R.data(cssum);
+	}
+
 }

--
Gitblit v1.9.3