From fc6f694cbc5c8d4f98bb98c51b87b4d73ac98885 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 03 Aug 2022 09:13:54 +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 496120a..dd4cafb 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -102,12 +102,23 @@
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入farmPlant")
 	public R<IPage<FarmPlantVO>> page(FarmPlantVO farmPlant, Query query) {
-//		IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+		IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+		return R.data(pages);
+	}
+
+	/**
+	 *首页当前种养产品总和
+	 */
+	@GetMapping("/strainCount")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入farmPlant")
+	public R<IPage<FarmPlantVO>> strainCount(FarmPlantVO farmPlant, Query query) {
 		IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCount(Condition.getPage(query), farmPlant);
 		return R.data(pages);
 	}
 
 
+
 	/**
 	 * 查询种养记录列表(不分页)
 	 * @param farmPlant

--
Gitblit v1.9.3