From 991770ca69d356362f123d1ff6d8df1ec7046c9c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 17 Oct 2022 11:21:42 +0800
Subject: [PATCH] 修复销售、加工、出库、损耗记录表的查询功能
---
src/main/java/org/springblade/modules/farmplant/controller/StrainController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 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 8136b65..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;
/**
* 农场检测报告/证书控制器
@@ -105,9 +107,33 @@
return R.status(strainService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 农产品列表
+ * @param strain
+ * @return
+ */
@GetMapping("/strain-tree")
public R strainTree(StrainVO strain){
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