From 4dff39db1e80e2c2dff1cf70f5ba9b199b5ebdc7 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Fri, 29 Jul 2022 11:36:27 +0800
Subject: [PATCH] 溯源码详情查询修改

---
 src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
index 92fb4d2..2df6b9a 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
@@ -25,6 +25,9 @@
 	 * @return
 	 */
 	List<FarmProductStockVO> selectFarmProductStockPage(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock);
+	List<FarmProductStockVO> selectFarmProductStockPages(@Param("farmProductStock") FarmProductStockVO farmProductStock);
+
+	List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(@Param("farmId") String farmId, @Param("strainId") Integer strainId);
 
 	/**
 	 * 统计产量
@@ -34,9 +37,11 @@
 	List<FarmProductStockVO> statisticsProduct(@Param("farmProductStock") FarmProductStockVO farmProductStock);
 	List<FarmProductStockVO> statisticsProductx(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock);
 	Map<String, String> selctProductCount(String year);
-	Map<String, String> statisticsStock(String year,String deptId);
-	Map<String, String> statisticsStockMonth(String year,String deptId);
-	Map<String, String> productsSupervise(String year,String deptId);
+	Map<String, String> statisticsStock(@Param("year") String year,@Param("farmId") String farmId);
+	List<Map<String, String>> statisticsStockYear(@Param("year") String year,@Param("farmId") String farmId);
+	List<Map<String, String>> statisticsStockMonth(@Param("year") String year,@Param("farmId") String farmId);
+	List<Map<String, String>> statisticsStockDay(@Param("year") String year,@Param("farmId") String farmId);
+	Map<String, String> productsSupervise(@Param("year") String year,@Param("farmId") String farmId);
 	List<Map<String, Double>> statisticsYield(String year,String deptId);
 	boolean stockCompare(double sale,String id);
 	boolean stockReduce(double sale,String id);

--
Gitblit v1.9.3