From ec09030f0730809145c97bfaa0bd0387a7d990bf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 19 Jul 2022 17:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 7 +++++++
src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java | 10 ++++++++++
src/main/java/org/springblade/modules/lang/controller/LandController.java | 10 ++++++++++
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 19 +++++++++++++++++++
src/main/java/org/springblade/modules/lang/service/ILandService.java | 7 +++++++
5 files changed, 53 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 a68688b..10a98d8 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -478,4 +478,14 @@
return R.data(map);
}
+ /**
+ * 查询统计地块是否有轮廓（是否有圈出区域）
+ * @param land
+ * @return
+ */
+ @GetMapping("/getLandIsAreaStatistic")
+ public R getLandIsAreaStatistic(LandVO land){
+ return R.data(landService.getLandIsAreaStatistic(land));
+ }
+
}
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 1ec5415..52e9326 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -81,4 +81,11 @@
* @return
*/
List<LandVO> getLandList(@Param("land") LandVO land);
+
+ /**
+ * 查询统计地块是否有轮廓（是否有圈出区域）
+ * @param land 地块参数
+ * @return
+ */
+ List<Integer> getLandIsAreaStatistic(@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 e748487..f92167f 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -198,4 +198,23 @@
GROUP BY sfp.strain_id
</select>
+ <!--查询统计地块是否有轮廓-->
+ <select id="getLandIsAreaStatistic" resultType="java.lang.Integer">
+ SELECT count(*) FROM sys_land where land_range is not null
+ <if test="land.farmId!= null and land.farmId!=''">
+ and farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and dept_id=#{land.deptId}
+ </if>
+ union all
+ SELECT count(*) FROM sys_land where land_range is null
+ <if test="land.farmId!= null and land.farmId!=''">
+ and farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and dept_id=#{land.deptId}
+ </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 216b9da..928d11b 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -85,4 +85,11 @@
* @return
*/
List<LandVO> getLandList(LandVO land);
+
+ /**
+ * 查询统计地块是否有轮廓（是否有圈出区域）
+ * @param land
+ * @return
+ */
+ List<Integer> getLandIsAreaStatistic(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 d2db78b..70d1e89 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
@@ -108,4 +108,14 @@
public List<LandVO> getLandList(LandVO land) {
return baseMapper.getLandList(land);
}
+
+ /**
+ * 查询统计地块是否有轮廓（是否有圈出区域）
+ * @param land 地块参数
+ * @return
+ */
+ @Override
+ public List<Integer> getLandIsAreaStatistic(LandVO land) {
+ return baseMapper.getLandIsAreaStatistic(land);
+ }
}
--
Gitblit v1.9.3