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/service/FarmingRecordService.java | 12 ++++++++++--
1 files changed, 10 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..37cb1a9 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,11 @@
* @return
*/
List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO);
+
+ /**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm);
}
--
Gitblit v1.9.3