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/mapper/FarmProductStockMapper.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 cc2fd4b..c17701d 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
@@ -27,6 +27,17 @@
List<FarmProductStockVO> selectFarmProductStockPage(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock);
/**
+ * 农资库存整合
+ * @param page
+ * @param farmProductStock
+ * @return
+ */
+ IPage<FarmProductStockVO> selectFarmProductStockPageCount(IPage<Object> page, FarmProductStockVO farmProductStock);
+ List<FarmProductStockVO> selectFarmProductStockPages(@Param("farmProductStock") FarmProductStockVO farmProductStock);
+
+ List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(@Param("farmId") String farmId, @Param("strainId") Integer strainId);
+
+ /**
* 统计产量
* @param farmProductStock
* @return
@@ -34,8 +45,20 @@
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> 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);
+
+ /**
+ * 查找对应数据
+ * @param strainId 品种id
+ * @param landId 地块id
+ * @return
+ */
+ FarmProductStock selectBy2Id(@Param("strainId") String strainId, @Param("landId") String landId);
}
--
Gitblit v1.9.3