From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 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 44ec99f..06562e3 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -4,9 +4,18 @@
<!--自定义查询农事记录分页数据-->
<select id="selectFarmingRecordPage" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
- select sfr.*,sl.land_name landName from sys_farming_record sfr
- left join sys_land sl on sl.id = sfr.land_id
- where 1=1
+ SELECT
+ sfr.*,
+ sl.land_name landName,
+ user.real_name,
+ strain.strain_name
+ FROM
+ sys_farming_record sfr
+ LEFT JOIN sys_land sl ON sl.id = sfr.land_id
+ LEFT JOIN blade_user user on sfr.operator = user.id
+ LEFT JOIN sys_strain strain on sfr.strain_id = strain.id
+ WHERE
+ 1 =1
<if test="farmingRecord.landId!=null and farmingRecord.landId!=''">
and sfr.land_id = #{farmingRecord.landId}
</if>
@@ -145,6 +154,31 @@
left join blade_user bu on bu.id = sfr.operator
where land_id = #{recovery.landId}
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