From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改

---
 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 10 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..3d515d0 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -13,6 +13,9 @@
 import org.springblade.modules.farmplant.entity.FarmProductStock;
 import org.springblade.modules.farmplant.service.FarmProductStockService;
 import org.springblade.modules.farmplant.vo.FarmProductStockVO;
+import org.springblade.modules.process.service.IProcessService;
+import org.springblade.modules.processInv.entity.ProcessInv;
+import org.springblade.modules.processInv.service.IProcessInvService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -31,6 +34,8 @@
 public class FarmProductStockController extends BladeController {
 
 	private final FarmProductStockService farmProductStockService;
+	private final IProcessInvService processInvService;
+	private final IProcessService processService;
 
 	/**
 	 * 详情
@@ -65,6 +70,15 @@
 		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);
+	}
+
 	/**
 	 * 自定义分页
 	 */
@@ -74,6 +88,15 @@
 	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));
 	}
 
 	/**
@@ -179,18 +202,26 @@
 		//统计当前库存农产品
 		Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
 		//统计当前库存加工产品
-		Map<String, String> jgsum = null;
-		map.put("sum",sum.get("sum"));
-		map.put("jgsum",0);
+//		Map<String, String> jgsum = null;
+		Double jgsum = processInvService.statisticsStock(year,farmId);
+		Double jgNcl = processService.statistics(year,farmId);
+		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",jgsum);
 
 		//农产品年产量统计
 //		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);
+		map.put("jgNcl",jgNcl);
 		return R.data(map);
 	}
 
@@ -199,15 +230,17 @@
 	 * 按月份统计产量
 	 */
 	@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);
+		Map<String,List<Map<String, String>>> map = new HashMap();
+		List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, farmId);
 		//加工产品数量统计
-		Map<String, String> jgsum = null;
+		List<Map<String, String>> jgsum = processService.statisticsMonth(year,farmId);
 
-		return R.data(cssum);
+		map.put("csssum",cssum);
+		map.put("jgsum",jgsum);
+		return R.data(map);
 	}
 
 	/**
@@ -221,4 +254,10 @@
 		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