From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001 From: guoshilong <123456> Date: Tue, 08 Nov 2022 09:04:56 +0800 Subject: [PATCH] 大屏溯源统计次数sql修改 --- src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java index 1083cad..68d770b 100644 --- a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java +++ b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.modules.farmplant.entity.FarmProductStock; +import org.springblade.modules.farmplant.service.impl.FarmProductStockServiceImpl; import org.springblade.modules.farmplant.vo.FarmProductStockVO; import java.util.List; @@ -24,6 +25,10 @@ * @return */ IPage<FarmProductStockVO> selectFarmProductStockPage(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock); + IPage<FarmProductStockVO> selectFarmProductStockPagesCount(IPage<Object> page, FarmProductStockVO farmProductStock); + List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock); + + List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId, Integer strainId); /** * 统计产量 @@ -34,11 +39,19 @@ IPage<FarmProductStockVO> statisticsProductx(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock); Map<String, String> selctProductCount(String year); Map<String, String> statisticsStock(String year,String deptId); - Map<String, String> statisticsStockMonth(String year,String deptId); + List<Map<String, String>> statisticsStockMonth(String year,String farmId); Map<String, String> productsSupervise(String year,String deptId); List<Map<String, Double>> statisticsYield(String year, String deptId); //查看库存是否充足 boolean stockCompare(double sale,String id); //减去相应库存 boolean stockReduce(double sale,String id); + + /** + * 查找对应数据 + * @param strainId 品种id + * @param landId 地块id + * @return + */ + FarmProductStock selectBy2Id(String strainId, String landId); } -- Gitblit v1.9.3