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/stockfactory/mapper/StockfactoryMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
index d6f5d5c..5ddfbe7 100644
--- a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
+++ b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
@@ -24,6 +24,11 @@
from sys_stockfactory
where is_deleted = 0
</select>
+ <select id="selectStockfactoryPages" resultMap="stockfactoryResultMap">
+ select *
+ from sys_stockfactory
+ where is_deleted = 0
+ </select>
<select id="selectStockFa" resultType="java.util.HashMap">
select id as dictKey, agricultural_name as dictValue
@@ -33,14 +38,18 @@
<!--小程序农资列表-->
<select id="selectStockIn" resultType="java.util.HashMap">
- SELECT s.id AS id,
+ SELECT DISTINCT s.id AS id,
s.agricultural_name AS agrname,
+ s.factory_name AS factoryname,
c.dict_value AS dic
FROM sys_stockfactory s
LEFT JOIN (SELECT dict_key, dict_value
FROM blade_dict_biz
WHERE CODE = 'stockType' AND is_deleted = 0) c ON c.dict_key = s.type
WHERE is_deleted = 0
+ <if test="name!=null and name!=''">
+ and (s.agricultural_name like concat('%',#{name},'%') or s.register_number like concat('%',#{name},'%') )
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3