From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 126 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 122 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 4aaf932..33c758e 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}
@@ -36,6 +42,15 @@
<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>
+ <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>
@@ -51,6 +66,15 @@
</if>
<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>
+ <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>
@@ -68,6 +92,15 @@
<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.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>
@@ -82,7 +115,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(年)-->
@@ -161,9 +201,6 @@
and YEAR(create_time)=YEAR(#{time});
</if>
</select>
-
-
-
<!--种植采收监管 产品等级（0：一等品)-->
@@ -257,5 +294,86 @@
</if>
</select>
+ <!--小程序查询农场养殖记录数据-->
+ <select id="getFarmPlantStatisticsCountz" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
+<!-- SELECT-->
+<!-- sfp.strain_id,-->
+<!-- ss.strain_name strainName,-->
+<!-- sum( sl.land_area ) area,-->
+<!-- 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.startTime!=null and farmPlant.startTime!=''">-->
+<!-- and sfp.transplan_time >= #{farmPlant.startTime}-->
+<!-- </if>-->
+<!-- <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
+ sfp.strain_id,
+ ss.strain_name strainName,
+ sum( sl.land_area ) area,
+ 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.startTime!=null and farmPlant.startTime!=''">
+ and sfp.transplan_time >= #{farmPlant.startTime}
+ </if>
+ <if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
+ and sfp.transplan_time <= #{farmPlant.endTime}
+ </if>
+<!-- 小程序端会传farmId和status的值过来，但是为了和web端统一所以不加入查询条件 -->
+<!-- <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>
+ <if test=" farmPlant.deptId !=null and farmPlant.deptId != ''">
+ and sfp.dept_id = #{farmPlant.deptId}
+ </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