From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块

---
 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java |   82 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 74 insertions(+), 8 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..17bafe9 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -65,6 +65,35 @@
 		return R.data(pages);
 	}
 
+
+	@GetMapping("/strainCount")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入farmProductStock")
+	public R<IPage<FarmProductStockVO>> strainCount(FarmProductStockVO farmProductStock, Query query) {
+		IPage<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPagesCount(Condition.getPage(query), farmProductStock);
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/pages")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入farmProductStock")
+	public R<List<FarmProductStockVO>> pages(FarmProductStockVO farmProductStock) {
+		List<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPages(farmProductStock);
+		return R.data(pages);
+	}
+
+	@GetMapping("/getFarmProductStockByFarmIdAndStrainId")
+	public R<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId,Integer strainId) {
+		List<FarmProductStock> farmProductStockList = farmProductStockService.findFarmProductStockByFarmIdAndStrainId(farmId,strainId);
+		if (farmProductStockList.size() == 0) {
+			return R.data(null);
+		}
+		return R.data(farmProductStockList.get(0));
+	}
+
 	/**
 	 * 统计产量
 	 *
@@ -161,28 +190,65 @@
 	 * 大屏经营概况库存数量与年产量
 	 */
 	@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"));
+		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");
-		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("jgNcl",0);
 		return R.data(map);
 	}
 
+
+	/**
+	 * 按月份统计产量
+	 */
+	@GetMapping("/statisticsStockMonth")
+	public R statisticsStockMonth(String year,String farmId) {
+
+		//采收数量统计
+		Map map = new HashMap();
+		List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, farmId);
+		//加工产品数量统计
+		Map<String, String> jgsum = null;
+
+		return R.data(cssum);
+	}
+
+	/**
+	 * 农产品监管
+	 */
+	@GetMapping("/productsSupervise")
+	public R productsSupervise(String year,String farmId) {
+
+		Map<String, String> cssum = farmProductStockService.productsSupervise(year, farmId);
+
+		return R.data(cssum);
+	}
+
+	@GetMapping("/getByLandId")
+	public R getByLandId(String strainId,String landId){
+		FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(strainId,landId);
+		return R.data(farmProductStock);
+	}
+
 }

--
Gitblit v1.9.3