From 0c90b05a7df664f8dcab2c4b330c07c7b80745a4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 30 May 2022 16:05:53 +0800
Subject: [PATCH] 种养结束修改

---
 src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index 3427d08..7b2e2eb 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -4,9 +4,16 @@
 
     <!--自定义查询采收记录分页数据-->
     <select id="selectRecoveryPage" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
-        select sfr.*,sl.land_name landName from sys_recovery sr
+        select sr.*,sl.land_name landName,ss.strain_name strainName from sys_recovery sr
         left join sys_land sl on sl.id = sr.land_id
+        left join sys_strain ss on ss.id = sr.strain_id
         where 1=1
+        <if test="recovery.strainId!=null and recovery.strainId!=''">
+            and sr.strain_id = #{recovery.strainId}
+        </if>
+        <if test="recovery.leaves!=null and recovery.leaves!=''">
+            and sr.leaves = #{recovery.leaves}
+        </if>
         <if test="recovery.landId!=null and recovery.landId!=''">
             and sr.land_id = #{recovery.landId}
         </if>

--
Gitblit v1.9.3