From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作,种植记录查询新增,地块,溯源码查询修改

---
 src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
index 7e6f953..a46d225 100644
--- a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
@@ -6,6 +6,7 @@
 import org.springblade.modules.farm.mapper.FarmingRecordMapper;
 import org.springblade.modules.farm.service.FarmingRecordService;
 import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.recovery.vo.RecoveryVO;
 import org.springblade.modules.system.entity.DictBiz;
 import org.springblade.modules.system.service.IDictBizService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,8 +69,8 @@
 	 * @return
 	 */
 	@Override
-	public Object getFarmingCount() {
-		return baseMapper.getFarmingCount();
+	public Object getFarmingCount(String deptId) {
+		return baseMapper.getFarmingCount(deptId);
 	}
 
 	/**
@@ -77,7 +78,42 @@
 	 * @return
 	 */
 	@Override
-	public Object getFarmingStatis() {
-		return baseMapper.getFarmingStatis();
+	public Object getFarmingStatis(String deptId) {
+		return baseMapper.getFarmingStatis(deptId);
+	}
+
+	@Override
+	public Double selectJyCount(String deptId) {
+		return baseMapper.selectJyCount(deptId);
+	}
+
+	@Override
+	public Double selectQyCount(String deptId) {
+		return baseMapper.selectQyCount(deptId);
+	}
+
+	@Override
+	public Double selectByCount(String deptId) {
+		return baseMapper.selectByCount(deptId);
+	}
+
+	/**
+	 * 查询农事记录信息(种植开始起)
+	 * @param recoveryVO 采收信息
+	 * @return
+	 */
+	@Override
+	public List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO) {
+		return baseMapper.getFarmingRecordByFarmPlantId(recoveryVO);
+	}
+
+	/**
+	 * 查询农事操作记录(不分页)
+	 * @param farm
+	 * @return
+	 */
+	@Override
+	public List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm) {
+		return baseMapper.getFarmingRecordListfarm(farm);
 	}
 }

--
Gitblit v1.9.3