From abf97299ede3798c35377d0ea8b559f91c586b89 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 13:28:47 +0800
Subject: [PATCH] 全文搜索
---
src/main/webapp/views/adjDetl/adjDetl.html | 6 +++++-
src/main/java/com/zy/common/web/BaseController.java | 13 +++++++++++++
src/main/resources/mapper/LocDetlMapper.xml | 9 +++++++++
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 2 ++
src/main/webapp/views/pakStore/locDetlQuery.html | 6 +++++-
src/main/webapp/views/pakStore/matQuery.html | 6 +++++-
6 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index be530f5..dfc2cbc 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -39,10 +39,12 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(AdjDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 62c9fbe..7795ae8 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
@@ -16,6 +17,7 @@
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -50,6 +52,17 @@
return "";
}
+ protected <T> Page<T> toPage(Integer curr, Integer limit, Map<String, Object> param){
+ Page<T> page = new Page<T>(curr, limit);
+
+ param.entrySet().removeIf(next -> next.getKey().equals("curr")
+ || next.getKey().equals("limit")
+ || next.getKey().equals("orderByField")
+ || next.getKey().equals("orderByType")
+ || Cools.isEmpty(next.getValue()));
+ return page;
+ }
+
/**
* 鍏ㄥ瓧娈垫ā绯婃悳绱�
* @param cls 妯″瀷绫�
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d2eac54..021f266 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -30,6 +30,15 @@
<if test="matnr!=null and matnr!='' ">
and a.matnr like '%' + #{matnr} + '%'
</if>
+ <if test="maktx!=null and maktx!='' ">
+ and a.maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="anfme!=null and anfme!='' ">
+ and a.anfme like '%' + #{anfme} + '%'
+ </if>
+ <if test="altme!=null and altme!='' ">
+ and a.altme like '%' + #{altme} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/adjDetl/adjDetl.html b/src/main/webapp/views/adjDetl/adjDetl.html
index 5f1352c..62502c2 100644
--- a/src/main/webapp/views/adjDetl/adjDetl.html
+++ b/src/main/webapp/views/adjDetl/adjDetl.html
@@ -36,7 +36,11 @@
</div>
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index efe43ab..2e0a168 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -59,7 +59,11 @@
<input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index a0067af..f9241a7 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -31,7 +31,11 @@
<input class="layui-input" type="text" name="mat_no" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
--
Gitblit v1.9.1