From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 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 74c080c..c34add1 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -105,6 +105,56 @@
return R.data(pages);
}
+
+ /**
+ * 查询种养记录列表（不分页）
+ * @param farmPlant
+ * @return
+ */
+ @GetMapping("/getFarmPlantList")
+ public R getFarmPlantList(FarmPlantVO farmPlant) {
+ return R.data(farmplantService.getFarmPlantList(farmPlant));
+ }
+
+
+ /**
+ * 分页统计
+ */
+ @GetMapping("/pageCount")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入farmPlant")
+ public R<List<FarmPlantVO>> pageCount(FarmPlantVO farmPlant, Query query) {
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+ List<FarmPlantVO> res = pages.getRecords();
+ List<FarmPlantVO> count = new ArrayList<>();
+ //按种类合并种植物
+ for (int i = 0; i < res.size(); i++) {
+ if (i == 0){
+ count.add(res.get(0));
+ }else {
+ boolean type = false;
+ for (int j = 0; j < count.size(); j++) {
+ if (res.get(i).getStrainId().equals(count.get(j).getStrainId())){
+ FarmPlantVO data = new FarmPlantVO();
+ data.setStrainId(res.get(i).getStrainId());
+ data.setArea((Double.parseDouble(res.get(i).getArea()) + Double.parseDouble(count.get(j).getArea()))+"");
+ data.setStrainName(res.get(i).getStrainName());
+ count.set(j,data);
+ type = false;
+ break;
+ }else{
+ type = true;
+ }
+ }
+ if (type){
+ count.add(res.get(i));
+ }
+ }
+ }
+
+ return R.data(count);
+ }
+
/**
* 新增
*/
--
Gitblit v1.9.3