From 86ca03a40065388aecc60973a3359c177a9fbb4a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 14 Jul 2022 17:30:07 +0800
Subject: [PATCH] 地块统计接口修改

---
 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 9f8f0b5..37be076 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -145,10 +145,10 @@
         SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit FROM sys_land
         WHERE is_deleted = 0
         <if test="land.farmId!= null and land.farmId!=''">
-            and sl.farm_id=#{land.farmId}
+            and farm_id=#{land.farmId}
         </if>
         <if test="land.deptId!= null and land.deptId!=''">
-            and sl.dept_id=#{land.deptId}
+            and dept_id=#{land.deptId}
         </if>
     </select>
     <!--土地使用面积-->
@@ -158,10 +158,10 @@
         WHERE is_deleted = 0
         and type = 0
         <if test="land.farmId!= null and land.farmId!=''">
-            and sl.farm_id=#{land.farmId}
+            and farm_id=#{land.farmId}
         </if>
         <if test="land.deptId!= null and land.deptId!=''">
-            and sl.dept_id=#{land.deptId}
+            and dept_id=#{land.deptId}
         </if>
     </select>
     <!--土地未使用面积-->
@@ -171,10 +171,10 @@
         WHERE is_deleted = 0
         and type = 1
         <if test="land.farmId!= null and land.farmId!=''">
-            and sl.farm_id=#{land.farmId}
+            and farm_id=#{land.farmId}
         </if>
         <if test="land.deptId!= null and land.deptId!=''">
-            and sl.dept_id=#{land.deptId}
+            and dept_id=#{land.deptId}
         </if>
     </select>
 
@@ -186,7 +186,7 @@
             and sl.farm_id=#{land.farmId}
         </if>
         <if test="land.deptId!= null and land.deptId!=''">
-            and sl.dept_id=#{land.deptId}
+            and sfp.dept_id=#{land.deptId}
         </if>
         GROUP BY sfp.strain_id
     </select>

--
Gitblit v1.9.3