From 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jul 2022 15:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 be86e9c..06562e3 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -156,4 +156,29 @@
and strain_id = #{recovery.strainId}
order by sfr.time asc,sfr.create_time asc
</select>
+
+ <!--查询农事操作记录（不分页）-->
+ <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
+ 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}
+ order by sfr.time desc,sfr.create_time desc
+ </select>
</mapper>
--
Gitblit v1.9.3