From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001 From: zengh <123456> Date: Mon, 01 Aug 2022 10:36:26 +0800 Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题 --- src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 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 7250bff..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,16 +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(); + 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