From 97da879dc16dffb2fbcc7447dee7db819049fa02 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 15 Oct 2022 11:35:16 +0800
Subject: [PATCH] 农资查询添加模糊查询

---
 src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml |   12 +++++++++++-
 1 files changed, 11 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 442a1f9..d31e82b 100644
--- a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
+++ b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
@@ -23,6 +23,12 @@
         select *
         from sys_stockfactory
         where is_deleted = 0
+        <if test="stockfactory.agriculturalName !=null and stockfactory.agriculturalName!= '' ">
+            AND agricultural_name LIKE CONCAT('%',#{stockfactory.agriculturalName},'%')
+        </if>
+        <if test="stockfactory.type != null and stockfactory.type !='' or stockfactory.type ==0 ">
+            AND type = #{stockfactory.type}
+        </if>
     </select>
     <select id="selectStockfactoryPages" resultMap="stockfactoryResultMap">
         select *
@@ -38,14 +44,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