From 85de465560468fe08f6d846e2d6beacb20b71da3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 14 Jul 2022 17:04:21 +0800
Subject: [PATCH] 地块统计接口修改
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 f249185..da82f42 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -162,24 +162,26 @@
<!--查询农事操作记录（不分页）-->
<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
+ 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}
--
Gitblit v1.9.3