From 3efd7f01cba4aaa09f75662e287bfa4c780990cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 16:22:05 +0800
Subject: [PATCH] 地块id添加
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..be86e9c 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,6 @@
left join blade_user bu on bu.id = sfr.operator
where land_id = #{recovery.landId}
and strain_id = #{recovery.strainId}
- order by sfr.time desc,sfr.create_time desc
+ order by sfr.time asc,sfr.create_time asc
</select>
</mapper>
--
Gitblit v1.9.3