From 7342c944e24f884a2ef7826bd6c9e0442b06d2a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 01 Jun 2022 17:18:09 +0800
Subject: [PATCH] 农事操作新增农产品绑定,采收修改,农产品种植修改,新增根据地块查询农产品

---
 src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java |   13 +++++++++++++
 1 files changed, 13 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..d9a7a55 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,14 @@
 		return R.data(farmplantService.getFarmPlantStatistics(Condition.getPage(query),farmPlantVO));
 	}
 
+	/**
+	 * 农产品列表
+	 * @param farm 农产品对象
+	 * @return
+	 */
+	@GetMapping("/strain-tree")
+	public R strainTree(FarmPlantVO farm){
+		return R.data(farmplantService.strainTree(farm));
+	}
+
 }

--
Gitblit v1.9.3