From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址

---
 src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
index 6584403..b1cd6d7 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -107,6 +107,17 @@
 
 
 	/**
+	 * 查询种养记录列表(不分页)
+	 * @param farmPlant
+	 * @return
+	 */
+	@GetMapping("/getFarmPlantList")
+	public R getFarmPlantList(FarmPlantVO farmPlant) {
+		return R.data(farmplantService.getFarmPlantList(farmPlant));
+	}
+
+
+	/**
 	 * 分页统计
 	 */
 	@GetMapping("/pageCount")
@@ -284,7 +295,7 @@
 	 */
 	@GetMapping("/pagePalnt")
 	public R pagePalnt(FarmPlantVO farmPlant, Query query) {
-		int i = farmplantService.selectCount();
+		int i = farmplantService.selectCount(farmPlant);
 		IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
 		Map map = new HashMap<>();
 		map.put("num", i);

--
Gitblit v1.9.3