From 6ecd2ab6dcad78dc520f4ff881ce37d258b635d6 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 05 Aug 2022 11:56:46 +0800
Subject: [PATCH] 根据品种id和农场id找到对应种养品种的地块
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 2 ++
src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java | 5 +++++
src/main/java/org/springblade/modules/lang/controller/LandController.java | 11 ++++++++++-
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 9 +++++++++
src/main/java/org/springblade/modules/lang/service/ILandService.java | 9 ++++++++-
5 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index 2cea1b2..95f9d57 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -108,7 +108,7 @@
return R.data(pages);
}
/**
- * 根据品种id查询对应地块
+ * 根据品种id查询对应地块(农产品库存)
*/
@GetMapping("/selcetByStrainId")
public R selcetByStrainId(String strainId,String farmId) {
@@ -117,6 +117,15 @@
}
/**
+ * 根据品种id查询对应地块(农产品库存)
+ */
+ @GetMapping("/getByStrainIdFarmId")
+ public R getByStrainIdFarmId(String strainId,String farmId) {
+ List<Land> list = landService.getByStrainIdFarmId(strainId,farmId);
+ return R.data(list);
+ }
+
+ /**
* 新增 地块表
*/
@PostMapping("/save")
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
index 82fb314..840b1e7 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -95,4 +95,6 @@
* @return
*/
List<Land> selectByStrainId(@Param("strainId") String strainId,@Param("farmId") String farmId);
+
+ List<Land> getByStrainIdFarmId(String strainId, String farmId);
}
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index cef2023..fc1ed16 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -228,5 +228,14 @@
AND land.farm_id = #{farmId}
</if>
</select>
+ <select id="getByStrainIdFarmId" resultType="org.springblade.modules.lang.entity.Land">
+ SELECT land.id,land.land_name,land.url,land.farm_id
+ FROM sys_land land
+ LEFT JOIN sys_farm_plant sfp ON sfp.land_id = land.id
+ WHERE sfp.strain_id = #{strainId}
+ <if test="farmId !=null and farmId != '' ">
+ AND land.farm_id = #{farmId}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/lang/service/ILandService.java b/src/main/java/org/springblade/modules/lang/service/ILandService.java
index c943e43..691a15d 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -94,10 +94,17 @@
List<Integer> getLandIsAreaStatistic(LandVO land);
/**
- * 根据品种id查询地块
+ * 根据品种id查询地块(农产品库存)
* @param strainId 品种id
* @param farmId 农场id
* @return
*/
List<Land> selectByStrainId(String strainId,String farmId);
+ /**
+ * 根据品种id查询地块(种养品种)
+ * @param strainId 品种id
+ * @param farmId 农场id
+ * @return
+ */
+ List<Land> getByStrainIdFarmId(String strainId, String farmId);
}
diff --git a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
index 9948fb7..89186de 100644
--- a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
+++ b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
@@ -123,4 +123,9 @@
public List<Land> selectByStrainId(String strainId,String farmId) {
return baseMapper.selectByStrainId(strainId,farmId);
}
+
+ @Override
+ public List<Land> getByStrainIdFarmId(String strainId, String farmId) {
+ return baseMapper.getByStrainIdFarmId(strainId,farmId);
+ }
}
--
Gitblit v1.9.3