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/retrieval/mapper/RetrievalMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
index d9e0a7d..9826336 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -23,6 +23,8 @@
<result column="city" property="city"/>
<result column="county" property="county"/>
<result column="land_id" property="landId"/>
+ <result column="city_name" property="cityName"/>
+ <result column="district_name" property="countyName"/>
</resultMap>
@@ -30,13 +32,19 @@
SELECT
retrieval.*,
strain.strain_name,
- district.name as district
+ district.name as district,
+ region.city_name,
+ region.district_name
FROM
sys_retrieval retrieval
LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
LEFT JOIN sys_district district ON retrieval.sale_destination = district.code
+ LEFT JOIN blade_region region on retrieval.county = region.district_code
WHERE
- is_deleted = 0
+ <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
+ retrieval.strain_id = #{retrieval.strainId} AND
+ </if>
+ is_deleted = 0 ORDER BY retrieval.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3