From fe83afa153234db5a41445e05e26c30df2f93608 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 10 Aug 2022 16:20:53 +0800
Subject: [PATCH] 农事详情记录查询

---
 src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
index ecfac3e..85b0ff9 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -4,7 +4,7 @@
 
     <!--自定义查询溯源码分页数据-->
     <select id="selectTraceabilityPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
-        select st.* from sys_traceability st
+        select st.*,sr.land_id landId from sys_traceability st
         left join sys_recovery sr on st.recovery_id = sr.id
         LEFT JOIN sys_land sl ON sl.id = sr.land_id
         where 1=1
@@ -19,6 +19,25 @@
         </if>
     </select>
 
+    <!--自定义查询溯源码分页数据-->
+    <select id="selectTraceabilityXcxPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
+        select a.id,a.code,c.land_name as landName,c.id as landId,a.product_name productName,
+               a.create_time createTime,d.url,d.strain_name AS strainName,b.create_time AS recoveryTime from sys_traceability a
+        LEFT JOIN sys_recovery b ON a.recovery_id = b.id
+        LEFT JOIN sys_land c ON b.land_id = c.id
+        LEFT JOIN sys_strain d ON b.strain_id = d.id
+        where 1=1
+        <if test="traceability.code!=null and traceability.code!=''">
+            and a.code like concat('%',#{traceability.code},'%')
+        </if>
+        <if test="traceability.farmId!=null and traceability.farmId!=''">
+            and c.farm_id = #{traceability.farmId}
+        </if>
+        <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+            and a.tenant_id = #{traceability.tenantId}
+        </if>
+    </select>
+
     <!--自定义查询溯源码数据,不分页-->
     <select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
         select st.* from sys_traceability st

--
Gitblit v1.9.3