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/farmplant/service/FarmPlantService.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java b/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
index 559a7b2..21448bc 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
@@ -4,7 +4,12 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.farmplant.entity.FarmPlant;
+import org.springblade.modules.farmplant.entity.Strain;
 import org.springblade.modules.farmplant.vo.FarmPlantVO;
+import org.springblade.modules.farmplant.vo.StrainVO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 农场养殖记录表服务类
@@ -21,6 +26,8 @@
 	 * @return
 	 */
 	IPage<FarmPlantVO> selectFarmPlantPage(IPage<FarmPlantVO> page, FarmPlantVO farm);
+	IPage<FarmPlantVO> selectFarmPlantPageCount(IPage<Object> page, FarmPlantVO farmPlant);
+	IPage<FarmPlantVO> getFarmPlantStatisticsCountz(IPage<FarmPlantVO> page, FarmPlantVO farm);
 
 	/**
 	 * 农产品种养统计
@@ -29,4 +36,37 @@
 	 * @return
 	 */
 	IPage<FarmPlantVO> getFarmPlantStatistics(IPage<FarmPlantVO> page,FarmPlantVO farmPlantVO);
+
+	/**
+	 * 农产品列表
+	 * @param farm 农产品对象
+	 * @return
+	 */
+    List<Strain> strainTree(FarmPlantVO farm);
+
+	/**
+	 * 农产品种养统计(累计和)
+	 * @param farmPlantVO 农产品种植对象
+	 * @return
+	 */
+	FarmPlantVO getFarmPlantStatisticsCount(FarmPlantVO farmPlantVO);
+	int selectCount(FarmPlantVO farmPlantVO);
+	Map selectPlant(String code,String time);
+	Map selectPlantl(String code,String time);
+	Map selectPlantw(String code,String time);
+	Map selectPlantp(String code,String time);
+	Map selectProduct(String code,String time);
+	Map selectProducty(String code, String time);
+	Map selectProductr(String code, String time);
+	Map selectProducts(String code, String time);
+	Map selectProductf(String code, String time);
+
+	/**
+	 * 查询种养记录列表（不分页）
+	 * @param farmPlant
+	 * @return
+	 */
+    List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant);
+
+
 }

--
Gitblit v1.9.3