From 4d48da87faccd9c11fe644e92edd54ca0e167b69 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:47:40 +0800
Subject: [PATCH] 农场，地块列表查询新增，不分页
---
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 b7e18f8..25c25ed 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -4,10 +4,32 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="selectTraceabilityPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
- select * from sys_traceability
+ select st.* from sys_traceability st
+ left join sys_recovery sr on st.recovery_id = sr.id
where 1=1
<if test="traceability.code!=null and traceability.code!=''">
- and code = #{traceability.code}
+ and st.code = #{traceability.code}
</if>
+ <if test="traceability.deptId!=null and traceability.deptId!=''">
+ and st.dept_id = #{traceability.deptId}
+ </if>
+ <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+ and st.tenant_id = #{traceability.tenantId}
+ </if>
+ </select>
+
+ <select id="selectRevorid" resultType="java.lang.String">
+ select recovery_id from sys_traceability where code=#{code}
+ </select>
+
+ <!--获取溯源简介信息-->
+ <select id="getSimpleInfo" resultType="org.springblade.modules.traceability.dto.TraceabilityDTO">
+ SELECT concat(sf.farm_name,'-',ifnull(sl.land_name,'-'),'-',ss.strain_name,'-',sr.time,' 采收') remark FROM `sys_traceability` st
+ left join blade_dept bd on bd.id = st.dept_id
+ left join sys_recovery sr on sr.id = st.recovery_id
+ left join sys_land sl on sl.id = sr.land_id
+ left join sys_strain ss on ss.id = sr.strain_id
+ left join sys_farm sf on sf.dept_id = bd.id
+ where st.code = #{traceability.code}
</select>
</mapper>
--
Gitblit v1.9.3