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/farm/mapper/FarmingRecordMapper.xml | 132 +++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 49 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
index 06562e3..0b75f30 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -40,6 +40,9 @@
<if test="farmingRecord.strainId!=null and farmingRecord.strainId!=''">
and sfr.strain_id = #{farmingRecord.strainId}
</if>
+ <if test="farmingRecord.farmId!=null and farmingRecord.farmId!=''">
+ and sl.farm_id = #{farmingRecord.farmId}
+ </if>
</select>
<select id="selectFarmingRecordPages" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
@@ -75,62 +78,67 @@
<!--查询统计本年农事记录操作总数-->
<select id="getFarmingCount" resultType="java.lang.Integer">
select ifnull(count(*), 0) count
- from sys_farming_record
+ from sys_farming_record ss
+ LEFT JOIN sys_land sl ON sl.id = ss.land_id
where 1=1
and YEAR (time)= YEAR (NOW())
- and dept_id=#{deptId}
+ <if test="farmId != null and farmId != ''">
+ and sl.farm_id = #{sale.farmId}
+ </if>
</select>
<!--查询统计本年农事记录操作总数-->
<select id="getFarmingStatis" resultType="org.springblade.modules.farm.vo.FarmingStatisVO">
- select case
- when type = 0 then '施肥'
- when type = 1 then '翻耕'
- when type = 2 then '灌溉'
- when type = 3 then '起垄'
- when type = 4 then '用药'
- when type = 5 then '追肥'
- when type = 6 then '除草'
- when type = 7 then '修剪'
- when type = 8 then '浸种'
- when type = 9 then '拌种'
- when type = 10 then '移栽'
- when type = 11 then '直播'
- when type = 12 then '采收'
+ select ss.type,case when ss.type = 0 then '施肥'
+ when ss.type = 1 then '翻耕'
+ when ss.type = 2 then '灌溉'
+ when ss.type = 3 then '起垄'
+ when ss.type = 4 then '用药'
+ when ss.type = 5 then '追肥'
+ when ss.type = 6 then '除草'
+ when ss.type = 7 then '修剪'
+ when ss.type = 8 then '浸种'
+ when ss.type = 9 then '拌种'
+ when ss.type = 10 then '移栽'
+ when ss.type = 11 then '直播'
+ when ss.type = 12 then '采收'
else '其他' end as name,
ifnull(count(*), 0) value
- from sys_farming_record
+ from sys_farming_record ss
+ LEFT JOIN sys_land sl ON sl.id = ss.land_id
where 1=1
and YEAR (time)= YEAR (NOW())
- and dept_id=#{deptId}
- group by type
+ <if test="farmId != null and farmId != ''">
+ and sl.farm_id = #{sale.farmId}
+ </if>
+ group by ss.type
</select>
<!--今年农资使用量-->
<select id="selectJyCount" resultType="java.lang.Double">
- SELECT IFNULL(SUM(census), 0) AS jynum
- FROM sys_farming_record
+ SELECT IFNULL(SUM(census), 0) AS jynum FROM sys_farming_record sfr
+ left join sys_land sl on sl.id = sfr.land_id
WHERE
- YEAR ( time ) = YEAR ( NOW( ) )
- AND stock_id != NULL
- and dept_id=#{deptId}
+ YEAR(sfr.time) = YEAR(NOW())
+ AND sfr.stock_id != NULL
+ and sl.farm_id=#{farmId}
</select>
<!--去年农资使用量-->
<select id="selectQyCount" resultType="java.lang.Double">
- SELECT IFNULL(SUM(census), 0) AS qynum
- FROM sys_farming_record
+ SELECT IFNULL(SUM(census), 0) AS qynum from sys_farming_record sfr
+ left join sys_land sl on sl.id = sfr.land_id
WHERE
- YEAR (time) = YEAR ( date_sub(now()
+ YEAR (sfr.time) = YEAR ( date_sub(now()
, INTERVAL 1 YEAR))
- and dept_id=#{deptId}
+ and sl.farm_id=#{farmId}
</select>
<!--本月农资使用量-->
<select id="selectByCount" resultType="java.lang.Double">
- SELECT IFNULL(SUM(census), 0) AS bynum
- FROM sys_farming_record
- WHERE DATE_FORMAT(time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
- and dept_id = #{deptId}
+ SELECT IFNULL(SUM(census), 0) AS bynum from sys_farming_record sfr
+ left join sys_land sl on sl.id = sfr.land_id
+ WHERE DATE_FORMAT(sfr.time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ and sl.farm_id=#{farmId}
</select>
<!--查询农事记录信息(种植开始起)-->
@@ -160,25 +168,51 @@
<!--查询农事操作记录（不分页）-->
<select id="getFarmingRecordListfarm" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
select sfr.*,case
- when sfr.type = 0 then '施肥'
- when sfr.type = 1 then '翻耕'
- when sfr.type = 2 then '灌溉'
- when sfr.type = 3 then '起垄'
- when sfr.type = 4 then '用药'
- when sfr.type = 5 then '追肥'
- when sfr.type = 6 then '除草'
- when sfr.type = 7 then '修剪'
- when sfr.type = 8 then '浸种'
- when sfr.type = 9 then '拌种'
- when sfr.type = 10 then '移栽'
- when sfr.type = 11 then '直播'
- when sfr.type = 12 then '采收'
- else '其他' end as typeName,sl.land_name landName,ss.strain_name strainName,bu.real_name realName
+ when sfr.type = 0 then '施肥'
+ when sfr.type = 1 then '翻耕'
+ when sfr.type = 2 then '灌溉'
+ when sfr.type = 3 then '起垄'
+ when sfr.type = 4 then '用药'
+ when sfr.type = 5 then '追肥'
+ when sfr.type = 6 then '除草'
+ when sfr.type = 7 then '修剪'
+ when sfr.type = 8 then '浸种'
+ when sfr.type = 9 then '拌种'
+ when sfr.type = 10 then '移栽'
+ when sfr.type = 11 then '直播'
+ when sfr.type = 12 then '采收'
+ else '其他' end as typeName,sl.land_name landName,ss.strain_name strainName,
+ bu.real_name realName,ss1.agricultural_name agriculturalName
from sys_farming_record sfr
left join blade_user bu on bu.id = sfr.operator
- left join sys_land sl on sl.id = sfr.land_id
- left join sys_strain ss on ss.id = sfr.strain_id
- where sl.farm_id = #{farm.farmId}
+ left join sys_land sl on sl.id = sfr.land_id
+ left join sys_strain ss on ss.id = sfr.strain_id
+ left join sys_stockfactory ss1 on ss1.id = sfr.stock_id
+ where 1=1
+ <if test="farm.landId!=null and farm.landId!=''">
+ and sfr.land_id = #{farm.landId}
+ </if>
+ <if test="farm.type!=null and farm.type!=''">
+ and sfr.type = #{farm.type}
+ </if>
+ <if test="farm.stockId!=null and farm.stockId!=''">
+ and sfr.stock_id = #{farm.stockId}
+ </if>
+ <if test="farm.jobWay!=null and farm.jobWay!=''">
+ and sfr.job_way = #{farm.jobWay}
+ </if>
+ <if test="farm.operator!=null and farm.operator!=''">
+ and sfr.operator = #{farm.operator}
+ </if>
+ <if test="farm.deptId!=null and farm.deptId!=''">
+ and sfr.dept_id = #{farm.deptId}
+ </if>
+ <if test="farm.farmId!=null and farm.farmId!=''">
+ and sl.farm_id = #{farm.farmId}
+ </if>
+ <if test="farm.strainId!=null and farm.strainId!=''">
+ and sfr.strain_id = #{farm.strainId}
+ </if>
order by sfr.time desc,sfr.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3