From 6bb092445687eece46ac0f0fbf1e053adc39689e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 17 Aug 2022 11:37:23 +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 | 12 +++++++++---
src/main/java/org/springblade/modules/lang/service/ILandService.java | 5 ++---
src/main/java/org/springblade/modules/lang/vo/LandVO.java | 6 +++++-
6 files changed, 21 insertions(+), 12 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 bb6ed60..2261a08 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -120,8 +120,8 @@
* 根据品种id查询对应地块(种养品种)
*/
@GetMapping("/getByStrainIdFarmId")
- public R getByStrainIdFarmId(String strainId,String farmId) {
- List<Land> list = landService.getByStrainIdFarmId(strainId,farmId);
+ public R getByStrainIdFarmId(LandVO land) {
+ List<Land> list = landService.getByStrainIdFarmId(land);
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 840b1e7..1a3840e 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -96,5 +96,5 @@
*/
List<Land> selectByStrainId(@Param("strainId") String strainId,@Param("farmId") String farmId);
- List<Land> getByStrainIdFarmId(String strainId, String farmId);
+ List<Land> getByStrainIdFarmId(@Param("land")LandVO land);
}
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 3f13f7b..76b5872 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -235,9 +235,15 @@
SELECT DISTINCT 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}
+ WHERE land.is_deleted = 0
+ <if test="land.strainId !=null and land.strainId !=''">
+ AND sfp.strain_id = #{land.strainId}
+ </if>
+ <if test="land.farmId !=null and land.farmId != '' ">
+ AND land.farm_id = #{land.farmId}
+ </if>
+ <if test="land.sfpStatus !=null and land.sfpStatus !=''">
+ AND sfp.status = #{land.sfpStatus}
</if>
</select>
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 691a15d..cd31d4e 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -102,9 +102,8 @@
List<Land> selectByStrainId(String strainId,String farmId);
/**
* 根据品种id查询地块(种养品种)
- * @param strainId 品种id
- * @param farmId 农场id
+ * @param land
* @return
*/
- List<Land> getByStrainIdFarmId(String strainId, String farmId);
+ List<Land> getByStrainIdFarmId(LandVO land);
}
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 89186de..ba8817c 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
@@ -125,7 +125,7 @@
}
@Override
- public List<Land> getByStrainIdFarmId(String strainId, String farmId) {
- return baseMapper.getByStrainIdFarmId(strainId,farmId);
+ public List<Land> getByStrainIdFarmId(LandVO land) {
+ return baseMapper.getByStrainIdFarmId(land);
}
}
diff --git a/src/main/java/org/springblade/modules/lang/vo/LandVO.java b/src/main/java/org/springblade/modules/lang/vo/LandVO.java
index fe5b025..5f53e23 100644
--- a/src/main/java/org/springblade/modules/lang/vo/LandVO.java
+++ b/src/main/java/org/springblade/modules/lang/vo/LandVO.java
@@ -34,5 +34,9 @@
String dica;
String deptname;
String tenantId;
-
+ String strainId;
+ /**
+ * 种养品种植状态
+ */
+ String sfpStatus;
}
--
Gitblit v1.9.3