From cc07034948c1da11441aa8553bfc436d74199917 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 09 Sep 2022 10:21:26 +0800
Subject: [PATCH] 溯源地块选择只选择当前农场采收地块
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 2 ++
src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml | 1 +
src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java | 5 +++++
src/main/java/org/springblade/modules/lang/controller/LandController.java | 5 +++++
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 11 +++++++++++
src/main/java/org/springblade/modules/lang/service/ILandService.java | 2 ++
6 files changed, 26 insertions(+), 0 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 662e076..91de7cf 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -344,6 +344,11 @@
return R.data(landService.selectLandList(userid));
}
+ /**
+ * 获取采收地块列表
+ */
+ @GetMapping("/selectRecoveryLandList")
+ public R selectRecoveryLandList(String farmId){return R.data(landService.selectRecoveryLandList(farmId));}
/**
* 地块列表(不分页)
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 d7f0f28..8ab85b5 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -99,4 +99,6 @@
List<Land> getByStrainIdFarmId(@Param("land")LandVO land);
List<LandVO> findPlantInLand(String ids);
+
+ List<LandVO> selectRecoveryLandList(@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 f726e00..b3ccf2f 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -270,5 +270,16 @@
WHERE land.is_deleted = 0 AND sfp.status = 1
AND land.id = #{ids}
</select>
+ <select id="selectRecoveryLandList" resultType="org.springblade.modules.lang.vo.LandVO">
+ SELECT
+ l.id,l.land_name AS landName
+ FROM
+ sys_recovery r
+ LEFT JOIN sys_land l ON r.land_id = l.id
+ WHERE l.is_deleted = 0
+ <if test="farmId !=null and farmId !=''">
+ AND r.dept_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 46be866..f4faff1 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -106,4 +106,6 @@
List<Land> getByStrainIdFarmId(LandVO land);
List<LandVO> findPlantInLand(String ids);
+
+ List<LandVO> selectRecoveryLandList(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 47b64e7..3a464ef 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
@@ -134,4 +134,9 @@
public List<LandVO> findPlantInLand(String ids) {
return baseMapper.findPlantInLand(ids);
}
+
+ @Override
+ public List<LandVO> selectRecoveryLandList(String farmId) {
+ return baseMapper.selectRecoveryLandList(farmId);
+ }
}
diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index 171625d..f00b69c 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -29,6 +29,7 @@
</if>
<if test="recovery.farmId != null and recovery.farmId != ''">
and sl.farm_id = #{recovery.farmId}
+ and sr.dept_id = #{recovery.farmId}
</if>
<if test="recovery.tenantId!=null and recovery.tenantId!=''">
and sr.tenant_id = #{recovery.tenantId}
--
Gitblit v1.9.3