From 8b36859fbe464c43fbfb8b2e8ef9ba4327d2d041 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 09 Sep 2022 09:40:35 +0800
Subject: [PATCH] 加工记录删除报错修复
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 23 +++++++++++++++++++++++
1 files changed, 23 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 dbbfe7c..d44480e 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -117,6 +117,15 @@
return R.data(pages);
}
+ /**
+ * 首页秧苗产品总和
+ */
+ @GetMapping("/strainCountYM")
+ public R<IPage<FarmPlantVO>> strainCountYM(FarmPlantVO farmPlant, Query query) {
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCountYM(Condition.getPage(query), farmPlant);
+ return R.data(pages);
+ }
+
/**
@@ -127,6 +136,16 @@
@GetMapping("/getFarmPlantList")
public R getFarmPlantList(FarmPlantVO farmPlant) {
return R.data(farmplantService.getFarmPlantList(farmPlant));
+ }
+
+ /**
+ * 查询种养记录列表(秧苗)（不分页）
+ * @param farmPlant
+ * @return
+ */
+ @GetMapping("/getFarmPlantYMList")
+ public R getFarmPlantYMList(FarmPlantVO farmPlant) {
+ return R.data(farmplantService.getFarmPlantYMList(farmPlant));
}
@@ -195,6 +214,10 @@
//直播
record.setType("11");
}
+ if(farmPlant.getPlantingWay().equals("2")){
+ //秧苗
+ record.setType("13");
+ }
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
record.setContent("品种: " + farmPlant.getVarieties());
--
Gitblit v1.9.3