From 9d1892790a7a18d18c19b8b1cf643056d1547f01 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 18:02:25 +0800
Subject: [PATCH] 农事操作，大屏统计接口调整，根据农场id 查询
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
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 482ea63..da1e7a9 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -81,6 +81,9 @@
<if test="land.tenantId!=null and land.tenantId != ''">
and tenant_id =#{land.tenantId}
</if>
+ <if test="land.farmId!=null and land.farmId != ''">
+ and farm_id =#{land.farmId}
+ </if>
</select>
<insert id="saveLandInfo">
@@ -139,11 +142,10 @@
</select>
<!--土地总面积-->
<select id="selectZAre" resultType="java.util.HashMap">
- SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
- FROM sys_land
+ SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit FROM sys_land
WHERE is_deleted = 0
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ <if test="farmId!= null and farmId!=''">
+ and farm_id=#{farmId}
</if>
</select>
<!--土地使用面积-->
@@ -152,8 +154,8 @@
FROM sys_land
WHERE is_deleted = 0
and type = 0
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ <if test="farmId!= null and farmId!=''">
+ and farm_id=#{farmId}
</if>
</select>
<!--土地未使用面积-->
@@ -162,18 +164,19 @@
FROM sys_land
WHERE is_deleted = 0
and type = 1
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ <if test="farmId!= null and farmId!=''">
+ and farm_id=#{farmId}
</if>
</select>
+
<select id="selectNum" resultType="java.util.HashMap">
- SELECT strain_id
- FROM `sys_farm_plant`
- WHERE status = 1
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ SELECT strain_id FROM sys_farm_plant sfp
+ left join sys_land sl on sl.id = sfp.land_id
+ WHERE sfp.status = 1
+ <if test="farmId!= null and farmId!=''">
+ and sl.farm_id=#{farmId}
</if>
- GROUP BY strain_id
+ GROUP BY sfp.strain_id
</select>
</mapper>
--
Gitblit v1.9.3