From 7abdd3ba7fa34c059f3c867e366d1a2137ae702f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 14 Jul 2022 17:08:24 +0800
Subject: [PATCH] kuc管理
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 3f81463..e333f40 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -12,8 +12,14 @@
<if test="farmPlant.plant!=null and farmPlant.plant!=''">
and sfp.plant = #{farmPlant.plant}
</if>
+ <if test="farmPlant.year!=null and farmPlant.year!=''">
+ and sfp.create_time like concat('%',#{farmPlant.year},'%')
+ </if>
<if test="farmPlant.landId!=null and farmPlant.landId!=''">
and sfp.land_id = #{farmPlant.landId}
+ </if>
+ <if test="farmPlant.strainId!=null and farmPlant.strainId!=''">
+ and sfp.strain_id = #{farmPlant.strainId}
</if>
<if test="farmPlant.plantingWay!=null and farmPlant.plantingWay!=''">
and sfp.planting_way = #{farmPlant.plantingWay}
@@ -41,6 +47,9 @@
</if>
<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>
@@ -85,6 +94,9 @@
</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>
@@ -179,9 +191,6 @@
and YEAR(create_time)=YEAR(#{time});
</if>
</select>
-
-
-
<!--种植采收监管 产品等级（0：一等品)-->
@@ -295,9 +304,37 @@
<if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
and sfp.dept_id = #{farmPlant.deptId}
</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>
+ <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+ and sl.farm_id = #{farmPlant.farmId}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.3