From fe9a0e82ce550d4c819cd002ca98f9c4aeb028cc Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Jun 2022 15:03:45 +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 b77b25e..da64666 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -32,12 +32,15 @@
import org.springblade.modules.farmplant.entity.FarmPlant;
import org.springblade.modules.farmplant.service.FarmPlantService;
import org.springblade.modules.farmplant.vo.FarmPlantVO;
+import org.springblade.modules.farmplant.vo.StrainVO;
import org.springblade.modules.lang.entity.Land;
import org.springblade.modules.lang.service.ILandService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -197,4 +200,24 @@
return R.data(farmplantService.getFarmPlantStatistics(Condition.getPage(query),farmPlantVO));
}
+ /**
+ * 农产品种养统计(累计和)
+ * @param farmPlantVO 农产品种植对象
+ * @return
+ */
+ @GetMapping("/getFarmPlantStatisticsCount")
+ public R<FarmPlantVO> getFarmPlantStatisticsCount(FarmPlantVO farmPlantVO) {
+ return R.data(farmplantService.getFarmPlantStatisticsCount(farmPlantVO));
+ }
+
+ /**
+ * 农产品列表
+ * @param farm 农产品对象
+ * @return
+ */
+ @GetMapping("/strain-tree")
+ public R strainTree(FarmPlantVO farm){
+ return R.data(farmplantService.strainTree(farm));
+ }
+
}
--
Gitblit v1.9.3