From 4e8eedbcaa35a3cce9e50dad54db9633e71d169f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 05 Sep 2022 17:02:48 +0800
Subject: [PATCH] 修改文件上传路径
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 2909d8c..555241c 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
@@ -22,6 +22,7 @@
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.vo.FarmingRecordVO;
import org.springblade.modules.farm.vo.FarmingStatisVO;
+import org.springblade.modules.recovery.vo.RecoveryVO;
import java.util.List;
@@ -40,16 +41,40 @@
* @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();
+ Integer getFarmingCount(String farmId);
/**
* 查询统计本年农事记录操作,按分类统计
* @return
*/
- List<FarmingStatisVO> getFarmingStatis();
+ List<FarmingStatisVO> getFarmingStatis(String farmId);
+ //今年农资使用量
+ Double selectJyCount(@Param("farmId") String farmId);
+ //去年农资使用量
+ Double selectQyCount(@Param("farmId") String deptId);
+ //本月农资使用量
+ Double selectByCount(@Param("farmId") String deptId);
+
+ /**
+ * 查询农事记录信息(种植开始起)
+ * @param recoveryVO 采收信息
+ * @return
+ */
+ List<FarmingRecordVO> getFarmingRecordByFarmPlantId(@Param("recovery") RecoveryVO recoveryVO);
+
+ /**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ List<FarmingRecordVO> getFarmingRecordListfarm(@Param("farm") FarmingRecordVO farm);
+
+ FarmingRecordVO getDetails(@Param("FarmingRecordVO") FarmingRecordVO farmingRecordVO);
}
--
Gitblit v1.9.3