From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断

---
 src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 ed4bb79..03404ef 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
@@ -26,6 +26,8 @@
 	 * @return
 	 */
 	IPage<FarmPlantVO> selectFarmPlantPage(IPage<FarmPlantVO> page, FarmPlantVO farm);
+	IPage<FarmPlantVO> selectFarmPlantPageCount(IPage<Object> page, FarmPlantVO farmPlant);
+	IPage<FarmPlantVO> selectFarmPlantPageCountYM(IPage<Object> page, FarmPlantVO farmPlant);
 	IPage<FarmPlantVO> getFarmPlantStatisticsCountz(IPage<FarmPlantVO> page, FarmPlantVO farm);
 
 	/**
@@ -49,7 +51,7 @@
 	 * @return
 	 */
 	FarmPlantVO getFarmPlantStatisticsCount(FarmPlantVO farmPlantVO);
-	int selectCount();
+	int selectCount(FarmPlantVO farmPlantVO);
 	Map selectPlant(String code,String time);
 	Map selectPlantl(String code,String time);
 	Map selectPlantw(String code,String time);
@@ -66,4 +68,6 @@
 	 * @return
 	 */
     List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant);
+
+	List<FarmPlantVO> getFarmPlantYMList(FarmPlantVO farmPlant);
 }

--
Gitblit v1.9.3