From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块
---
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml | 16 ++++++++++++++--
1 files changed, 14 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..6d8ebe0 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,23 @@
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
+ LEFT JOIN sys_land land ON land.id = retrieval.land_id
WHERE
- is_deleted = 0
+ <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
+ retrieval.strain_id = #{retrieval.strainId} AND
+ </if>
+ <if test="retrieval.farmId != null and retrieval.farmId !=''">
+ land.farm_id = #{retrieval.farmId} AND
+ </if>
+ retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3