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/recovery/mapper/RecoveryMapper.xml | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index 6d290b5..f3ce2eb 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -4,9 +4,14 @@
<!--自定义查询采收记录分页数据-->
<select id="selectRecoveryPage" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
- select sr.*,sl.land_name landName from sys_recovery sr
+ select sr.*,sl.land_name landName,ss.strain_name strainName,user.real_name as realName from sys_recovery sr
left join sys_land sl on sl.id = sr.land_id
+ left join sys_strain ss on ss.id = sr.strain_id
+ left join blade_user user ON user.id = sr.operator
where 1=1
+ <if test="recovery.strainName!=null and recovery.strainName!=''">
+ and ss.strain_name like concat ('%',#{recovery.strainName},'%')
+ </if>
<if test="recovery.strainId!=null and recovery.strainId!=''">
and sr.strain_id = #{recovery.strainId}
</if>
@@ -22,5 +27,32 @@
<if test="recovery.operator!=null and recovery.operator!=''">
and sr.operator = #{recovery.operator}
</if>
+ <if test="recovery.farmId != null and recovery.farmId != ''">
+ and sl.farm_id = #{recovery.farmId}
+ </if>
+ <if test="recovery.tenantId!=null and recovery.tenantId!=''">
+ and sr.tenant_id = #{recovery.tenantId}
+ </if>
+ </select>
+
+ <!--查询当前前缀已有的溯源码编号,取倒数7位的最大值-->
+ <select id="getCodePreCount" resultType="java.lang.Integer">
+ select ifnull(max(0+RIGHT(code,7)),0) from sys_traceability
+ where code like concat('%', #{pre},'%')
+ </select>
+
+ <!--查询农产品采收记录信息-->
+ <select id="getRecoveryDetail" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
+ select sr.id,sr.strain_id strainId,sr.land_id landId,sr.time,ss.strain_name strainName,ss.url,sr.farm_plant_id farmPlantId,
+ case
+ when sfp.plant = '0' then '有机'
+ when sfp.plant = 1 then '绿色'
+ when sfp.plant = 2 then '无公害'
+ else '普通' end as lx,
+ sl.farm_id farmId from sys_recovery sr
+ left join sys_strain ss on sr.strain_id = ss.id
+ left join sys_farm_plant sfp on sfp.id = sr.farm_plant_id
+ left join sys_land sl on sl.id = sr.land_id
+ where sr.id = #{recoveryId}
</select>
</mapper>
--
Gitblit v1.9.3