From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改

---
 src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
index 24c699a..205c252 100644
--- a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
+++ b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
@@ -26,18 +26,19 @@
 	 * @return
 	 */
 	IPage<FarmingRecordVO> selectFarmingRecordPage(IPage<FarmingRecordVO> page, FarmingRecordVO farm);
+	IPage<FarmingRecordVO> selectFarmingRecordPageByNz(IPage<FarmingRecordVO> page, FarmingRecordVO farm);
 	List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm);
 	/**
 	 * 查询统计本年农事记录操作总数
 	 * @return
 	 */
-	Object getFarmingCount(String deptId);
+	Object getFarmingCount(String farmId);
 
 	/**
 	 * 查询统计本年农事记录操作,按分类统计
 	 * @return
 	 */
-    Object getFarmingStatis(String deptId);
+    Object getFarmingStatis(String farmId);
 	//今年农资使用量
 	Double selectJyCount(String deptId);
 	//去年农资使用量
@@ -51,4 +52,13 @@
 	 * @return
 	 */
     List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO);
+
+	/**
+	 * 查询农事操作记录(不分页)
+	 * @param farm
+	 * @return
+	 */
+	List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm);
+
+	FarmingRecordVO getDetails(FarmingRecordVO farmingRecordVO);
 }

--
Gitblit v1.9.3