From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后,已出库待使用农资数据不变。修复使用农资后还能删除出库数据

---
 src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
index 4a4002a..03416d6 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
@@ -41,25 +41,26 @@
 	 * @return
 	 */
 	List<FarmingRecordVO> selectFarmingRecordPage(@Param("page") IPage page,@Param("farmingRecord") FarmingRecordVO farm);
+	List<FarmingRecordVO> selectFarmingRecordPageByNz(@Param("page") IPage page,@Param("farmingRecord") FarmingRecordVO farm);
 	List<FarmingRecordVO> selectFarmingRecordPages(@Param("farmingRecord") FarmingRecordVO farm);
 
 	/**
 	 * 查询统计本年农事记录操作总数
 	 * @return
 	 */
-    Integer getFarmingCount(String deptId);
+    Integer getFarmingCount(String farmId);
 
 	/**
 	 * 查询统计本年农事记录操作,按分类统计
 	 * @return
 	 */
-	List<FarmingStatisVO> getFarmingStatis(String deptId);
+	List<FarmingStatisVO> getFarmingStatis(String farmId);
 	//今年农资使用量
-	Double selectJyCount(String deptId);
+	Double selectJyCount(@Param("farmId") String farmId);
 	//去年农资使用量
-	Double selectQyCount(String deptId);
+	Double selectQyCount(@Param("farmId") String deptId);
 	//本月农资使用量
-	Double selectByCount(String deptId);
+	Double selectByCount(@Param("farmId") String deptId);
 
 	/**
 	 * 查询农事记录信息(种植开始起)

--
Gitblit v1.9.3