From 6007a2c08ef543bbc004b586cac544c3eb725ea0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 04 Aug 2022 10:38:50 +0800
Subject: [PATCH] 增加查询地块时有农场时的条件查询
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 2 +-
src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/lang/controller/LandController.java | 4 ++--
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 5 ++++-
src/main/java/org/springblade/modules/lang/service/ILandService.java | 3 ++-
5 files changed, 11 insertions(+), 7 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 fca780a..2cea1b2 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -111,8 +111,8 @@
* 根据品种id查询对应地块
*/
@GetMapping("/selcetByStrainId")
- public R selcetByStrainId(String strainId) {
- List<Land> list = landService.selectByStrainId(strainId);
+ public R selcetByStrainId(String strainId,String farmId) {
+ List<Land> list = landService.selectByStrainId(strainId,farmId);
return R.data(list);
}
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 0881eb6..82fb314 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -94,5 +94,5 @@
* @param strainId 品种id
* @return
*/
- List<Land> selectByStrainId(String strainId);
+ List<Land> selectByStrainId(@Param("strainId") String strainId,@Param("farmId") 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 5849346..cef2023 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -220,10 +220,13 @@
</select>
<select id="selectByStrainId" resultType="org.springblade.modules.lang.entity.Land">
- SELECT land.id,land.land_name
+ SELECT land.id,land.land_name,land.url,land.farm_id
FROM sys_land land
LEFT JOIN sys_farm_product_stock fps ON fps.land_id = land.id
WHERE fps.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 b52b98b..c943e43 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -96,7 +96,8 @@
/**
* 根据品种id查询地块
* @param strainId 品种id
+ * @param farmId 农场id
* @return
*/
- List<Land> selectByStrainId(String strainId);
+ List<Land> selectByStrainId(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 7052d69..9948fb7 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
@@ -120,7 +120,7 @@
}
@Override
- public List<Land> selectByStrainId(String strainId) {
- return baseMapper.selectByStrainId(strainId);
+ public List<Land> selectByStrainId(String strainId,String farmId) {
+ return baseMapper.selectByStrainId(strainId,farmId);
}
}
--
Gitblit v1.9.3