From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 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..93efdd2 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,28 @@
<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
+ WHERE
+ <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
+ retrieval.strain_id = #{retrieval.strainId} AND
+ </if>
+ is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3