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/farm/mapper/FarmPaperMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/StrainService.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
similarity index 60%
rename from src/main/java/org/springblade/modules/farm/mapper/StrainService.xml
rename to src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
index d226dd9..ebabcbe 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/StrainService.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
@@ -5,8 +5,11 @@
<!--自定义查询农场检测报告/证书分页数据-->
<select id="selectFarmPaperPage" resultType="org.springblade.modules.farm.vo.FarmPaperVO">
select * from sys_farm_paper where 1=1
- <if test="farmPaper.type!=null">
+ <if test="farmPaper.type!=null and farmPaper.type!=''">
and type = #{farmPaper.type}
+ </if>
+ <if test="farmPaper.deptId!=null and farmPaper.deptId!=''">
+ and dept_id = #{farmPaper.deptId}
</if>
<if test="farmPaper.farmId!=null">
and farm_id = #{farmPaper.farmId}
@@ -16,4 +19,12 @@
</if>
</select>
+ <!--查询相关检测信息-->
+ <select id="getFarmPaperList" resultType="org.springblade.modules.farm.vo.FarmPaperVO">
+ select * from sys_farm_paper
+ where 1=1
+ and (farm_id = #{farmId} and type != 3)
+ or (farm_id = #{farmPlantId} and type = 3)
+ </select>
+
</mapper>
--
Gitblit v1.9.3