From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index b17b9d6..5d836a4 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -48,6 +48,9 @@
<if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
and sfp.tenant_id = #{farmPlant.tenantId}
</if>
+ <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+ and sl.farm_id = #{farmPlant.farmId}
+ </if>
order by sfp.id desc
</select>
@@ -86,11 +89,14 @@
<if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
and sfp.transplan_time <= #{farmPlant.endTime}
</if>
- <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
- and sfp.dept_id = #{farmPlant.deptId}
+ <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+ and sl.farm_id = #{farmPlant.farmId}
</if>
<if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
and sfp.tenant_id = #{farmPlant.tenantId}
+ </if>
+ <if test="farmPlant.status!=null and farmPlant.status!=''">
+ and sfp.status = #{farmPlant.status}
</if>
group by sfp.strain_id,strain_name,land_unit
</select>
@@ -106,7 +112,14 @@
<select id="selectCount" resultType="java.lang.Integer">
SELECT IFNULL(COUNT(*), 0) as num
- FROM (SELECT strain_id FROM `sys_farm_plant` WHERE STATUS = 1 GROUP BY strain_id) a
+ FROM (SELECT strain_id
+ FROM `sys_farm_plant` ss
+ LEFT JOIN sys_land sl ON sl.id = ss.land_id
+ WHERE ss.STATUS = 1
+ <if test="farmPlant.farmId != null and farmPlant.farmId != ''">
+ and sl.farm_id = #{farmPlant.farmId}
+ </if>
+ GROUP BY strain_id) a
</select>
<!--种植品种监管 0：有机 code=1(当天) =2(月) =3(年)-->
@@ -295,13 +308,40 @@
<if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
and sfp.transplan_time <= #{farmPlant.endTime}
</if>
+ <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+ and sl.farm_id = #{farmPlant.farmId}
+ </if>
+ <if test="farmPlant.status!=null and farmPlant.status!=''">
+ and sfp.status = #{farmPlant.status}
+ </if>
+ <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
+ and sfp.tenant_id = #{farmPlant.tenantId}
+ </if>
+ group by sfp.strain_id,strain_name,land_unit
+ </select>
+
+ <!--查询种养记录列表（不分页）-->
+ <select id="getFarmPlantList" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
+ SELECT
+ sfp.*,
+ ss.strain_name strainName,
+ ss.url,
+ sl.land_area area,
+ sl.land_unit landUnit
+ FROM
+ sys_farm_plant sfp
+ LEFT JOIN sys_strain ss ON ss.id = sfp.strain_id
+ LEFT JOIN sys_land sl ON sl.id = sfp.land_id
+ where 1=1
<if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
and sfp.dept_id = #{farmPlant.deptId}
</if>
<if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
and sfp.tenant_id = #{farmPlant.tenantId}
</if>
- group by sfp.strain_id,strain_name,land_unit
+ <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+ and sl.farm_id = #{farmPlant.farmId}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3