From 5c3da097e8c5995bca5e1f8f5abdae29209bb7d1 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 28 Jul 2022 08:33:12 +0800
Subject: [PATCH] 小程序农资搜索
---
src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml | 6 +++++-
src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java | 4 ++--
src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java | 2 +-
src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java | 2 +-
src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java | 4 ++--
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
index 90a3a7e..0ad70ec 100644
--- a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
+++ b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
@@ -149,8 +149,8 @@
* @return
*/
@GetMapping("/selectStockIn")
- public R selectStockIn() {
- return R.data(stockfactoryService.selectStockIn());
+ public R selectStockIn(@RequestParam String name) {
+ return R.data(stockfactoryService.selectStockIn(name));
}
diff --git a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java
index adfad8b..03286e2 100644
--- a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java
+++ b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java
@@ -40,5 +40,5 @@
List<StockfactoryVO> selectStockfactoryPage(IPage page, StockfactoryVO stockfactory);
List<StockfactoryVO> selectStockfactoryPages( StockfactoryVO stockfactory);
List selectStockFa();
- List selectStockIn();
+ List selectStockIn(String name);
}
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..5ddfbe7 100644
--- a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
+++ b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
@@ -38,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>
diff --git a/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java b/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java
index 589470e..ac615e1 100644
--- a/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java
+++ b/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java
@@ -41,5 +41,5 @@
IPage<StockfactoryVO> selectStockfactoryPage(IPage<StockfactoryVO> page, StockfactoryVO stockfactory);
List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory);
List selectStockFa();
- List selectStockIn();
+ List selectStockIn(String name);
}
diff --git a/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java b/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java
index ef51c07..0589c72 100644
--- a/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java
+++ b/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java
@@ -51,8 +51,8 @@
}
@Override
- public List selectStockIn() {
- return baseMapper.selectStockIn();
+ public List selectStockIn(String name) {
+ return baseMapper.selectStockIn(name);
}
}
--
Gitblit v1.9.3