From fc6f694cbc5c8d4f98bb98c51b87b4d73ac98885 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 03 Aug 2022 09:13:54 +0800
Subject: [PATCH] 首页种养品种总和保留三位小数，详情接口和种养品种接口分离
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java | 19 ++++++++++++++++---
1 files changed, 16 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..71199ac 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,10 +37,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> 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);
+
+ /**
+ * 查找对应数据
+ * @param strainId 品种id
+ * @param landId 地块id
+ * @return
+ */
+ FarmProductStock selectBy2Id(@Param("strainId") String strainId, @Param("landId") String landId);
}
--
Gitblit v1.9.3