From 4e8eedbcaa35a3cce9e50dad54db9633e71d169f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 05 Sep 2022 17:02:48 +0800
Subject: [PATCH] 修改文件上传路径
---
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 5680d25..10be15e 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -3,8 +3,10 @@
<mapper namespace="org.springblade.modules.retrieval.mapper.RetrievalMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="retrievalResultMap" type="org.springblade.modules.retrieval.entity.Retrieval">
+ <resultMap id="retrievalResultMap" type="org.springblade.modules.retrieval.vo.RetrievalVO">
<result column="id" property="id"/>
+ <result column="strain_name" property="strainName"/>
+ <result column="district" property="district"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -21,11 +23,50 @@
<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>
<select id="selectRetrievalPage" resultMap="retrievalResultMap">
- select * from sys_retrieval where is_deleted = 0
+<!-- SELECT-->
+<!-- retrieval.*,-->
+<!-- strain.strain_name,-->
+<!-- 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-->
+<!-- <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
+ retrieval.*,
+ strain.strain_name,
+ bdb.dict_value AS reDestination
+ FROM
+ sys_retrieval retrieval
+ LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
+ LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = retrieval.sale_destination1
+ LEFT JOIN sys_land land ON land.id = retrieval.land_id
+ WHERE
+ bdb.code = "reDestination"
+ <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
+ AND retrieval.strain_id = #{retrieval.strainId}
+ </if>
+ <if test="retrieval.farmId != null and retrieval.farmId !=''">
+ AND land.farm_id = #{retrieval.farmId}
+ </if>
+ AND retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3