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/traceability/mapper/TraceabilityMapper.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 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 b7e18f8..ecfac3e 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -2,12 +2,57 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.traceability.mapper.TraceabilityMapper">
- <!--自定义查询农场养殖记录分页数据-->
+ <!--自定义查询溯源码分页数据-->
<select id="selectTraceabilityPage" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
- select * from sys_traceability
+ select st.* 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
<if test="traceability.code!=null and traceability.code!=''">
- and code = #{traceability.code}
+ and st.code like concat('%',#{traceability.code},'%')
</if>
+ <if test="traceability.farmId!=null and traceability.farmId!=''">
+ and sl.farm_id = #{traceability.farmId}
+ </if>
+ <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+ and st.tenant_id = #{traceability.tenantId}
+ </if>
+ </select>
+
+ <!--自定义查询溯源码数据，不分页-->
+ <select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
+ select st.* from sys_traceability st
+ left join sys_recovery sr on st.recovery_id = sr.id
+ left join sys_land sl on sr.land_id = sl.id
+ where 1=1
+ <if test="traceability.code!=null and traceability.code!=''">
+ and st.code like concat('%',#{traceability.code},'%')
+ </if>
+ <if test="traceability.deptId!=null and traceability.deptId!=''">
+ and st.dept_id = #{traceability.deptId}
+ </if>
+ <if test="traceability.tenantId!=null and traceability.tenantId!=''">
+ and st.tenant_id = #{traceability.tenantId}
+ </if>
+ <if test="traceability.farmId!=null and traceability.farmId!=''">
+ and sl.farm_id = #{traceability.farmId}
+ </if>
+ </select>
+
+ <select id="selectRevorid" resultType="java.lang.String">
+ select recovery_id
+ from sys_traceability
+ where code = #{code}
+ </select>
+
+ <!--获取溯源简介信息-->
+ <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 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.id = sl.farm_id
+ where st.code = #{traceability.code}
</select>
</mapper>
--
Gitblit v1.9.3