From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 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 01cf2c8..5c26df4 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
@@ -49,11 +49,10 @@
<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
+ left join sys_farm sf on sf.id = sl.farm_id
where st.code = #{traceability.code}
</select>
</mapper>
--
Gitblit v1.9.3