From 93115552ebbd463d5c52e01a73f8140a945d8940 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jul 2022 15:31:16 +0800
Subject: [PATCH] 大屏接口对接

---
 src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml |   15 ++++++++++++---
 1 files changed, 12 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 119cae5..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>

--
Gitblit v1.9.3