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/controller/StrainController.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/controller/StrainController.java b/src/main/java/org/springblade/modules/farmplant/controller/StrainController.java
index 7a808ee..7df4d37 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/StrainController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/StrainController.java
@@ -15,9 +15,11 @@
 import org.springblade.modules.farmplant.service.StrainService;
 import org.springblade.modules.farmplant.vo.StrainVO;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 农场检测报告/证书控制器
@@ -115,4 +117,23 @@
 		return R.data(strainService.strainTree(strain));
 	}
 
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/strain-trees")
+	public R<IPage<Strain>> list(@ApiIgnore @RequestParam Map<String, Object> strain, Query query) {
+		IPage<Strain> pages = strainService.page(Condition.getPage(query), Condition.getQueryWrapper(strain, Strain.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 获取农产品和加工产品列表
+	 * @return
+	 */
+	@GetMapping("kind-tree")
+	public R kindTree(){
+		return R.data(strainService.kindTree());
+	}
+
 }

--
Gitblit v1.9.3