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 | 26 ++++++++++++++++++++++++-- 1 files changed, 24 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 cc260e7..37cb1a9 100644 --- a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java +++ b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java @@ -6,6 +6,8 @@ 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; @@ -24,17 +26,37 @@ * @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(); + 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