From be9da335cb28e12e1439c24e4596f069e342d83f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
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 f020b79..840b1e7 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -63,16 +63,17 @@
* @return
*/
int updateLandById(@Param("land") Land land);
+ int updateLandAr(@Param("land") Land land);
List selectLandList(String userid);
- List selectNum(@Param("farmId") String farmId);
+ List selectNum(@Param("land") LandVO land);
- List<Map<String, Object>> selectZAre(@Param("farmId") String farmId);
+ List<Map<String, Object>> selectZAre(@Param("land") LandVO land);
- List<Map<String, Object>> selectSAre(@Param("farmId") String farmId);
+ List<Map<String, Object>> selectSAre(@Param("land") LandVO land);
- List<Map<String, Object>> selectWAre(@Param("farmId") String farmId);
+ List<Map<String, Object>> selectWAre(@Param("land") LandVO land);
/**
* 地块列表（不分页）
@@ -80,4 +81,20 @@
* @return
*/
List<LandVO> getLandList(@Param("land") LandVO land);
+
+ /**
+ * 查询统计地块是否有轮廓（是否有圈出区域）
+ * @param land 地块参数
+ * @return
+ */
+ List<Integer> getLandIsAreaStatistic(@Param("land") LandVO land);
+
+ /**
+ * 根据品种查询对应地块
+ * @param strainId 品种id
+ * @return
+ */
+ List<Land> selectByStrainId(@Param("strainId") String strainId,@Param("farmId") String farmId);
+
+ List<Land> getByStrainIdFarmId(String strainId, String farmId);
}
--
Gitblit v1.9.3