From 4dff39db1e80e2c2dff1cf70f5ba9b199b5ebdc7 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Fri, 29 Jul 2022 11:36:27 +0800
Subject: [PATCH] 溯源码详情查询修改

---
 src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 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 44f938c..20e2034 100644
--- a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
+++ b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
@@ -3,8 +3,13 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.farm.entity.FarmingRecord;
 import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.recovery.vo.RecoveryVO;
+import org.springblade.modules.traceability.entity.Traceability;
+
+import java.util.List;
 
 /**
  * 农事记录服务类
@@ -21,10 +26,36 @@
 	 * @return
 	 */
 	IPage<FarmingRecordVO> selectFarmingRecordPage(IPage<FarmingRecordVO> page, FarmingRecordVO farm);
-
+	List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm);
 	/**
 	 * 查询统计本年农事记录操作总数
 	 * @return
 	 */
-	Object getFarmingCount();
+	Object getFarmingCount(String farmId);
+
+	/**
+	 * 查询统计本年农事记录操作,按分类统计
+	 * @return
+	 */
+    Object getFarmingStatis(String farmId);
+	//今年农资使用量
+	Double selectJyCount(String deptId);
+	//去年农资使用量
+	Double selectQyCount(String deptId);
+	//本月农资使用量
+	Double selectByCount(String deptId);
+
+	/**
+	 * 查询农事记录信息(种植开始起)
+	 * @param recoveryVO 采收信息
+	 * @return
+	 */
+    List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO);
+
+	/**
+	 * 查询农事操作记录（不分页）
+	 * @param farm
+	 * @return
+	 */
+	List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm);
 }

--
Gitblit v1.9.3