From 0aabc79e45222782ce76e04c2c51437be89d610a Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 22 六月 2020 13:03:21 +0800 Subject: [PATCH] 全文搜索 --- src/main/webapp/views/locDetl/locDetl.html | 5 ++ src/main/java/com/zy/asrs/controller/WrkDetlController.java | 8 ++- src/main/webapp/views/wrkDetl/wrkDetl.html | 6 ++ src/main/webapp/views/wrkMast/wrkMast.html | 17 -------- src/main/webapp/views/wrkMastLog/wrkMastLog.html | 5 ++ src/main/java/com/zy/asrs/controller/LocDetlController.java | 2 + src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 8 ++- src/main/webapp/views/staDesc/staDesc.html | 2 src/main/java/com/zy/asrs/controller/WrkMastController.java | 8 ++- 9 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index fd9549f..cd3b2c7 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -44,10 +44,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<LocDetl> wrapper = new EntityWrapper<>(); convert(param, wrapper); + allLike(LocDetl.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper)); } diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java index c645c25..07b64bd 100644 --- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java +++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java @@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.zy.asrs.entity.WrkDetl; -import com.zy.asrs.service.WrkDetlService; -import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.service.WrkDetlService; +import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -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<WrkDetl> wrapper = new EntityWrapper<>(); convert(param, wrapper); + allLike(WrkDetl.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderByField)){ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); } else { diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java index e4d5516..e596706 100644 --- a/src/main/java/com/zy/asrs/controller/WrkMastController.java +++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java @@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.zy.asrs.entity.WrkMast; -import com.zy.asrs.service.WrkMastService; -import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.WrkMastService; +import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -36,10 +36,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<WrkMast> wrapper = new EntityWrapper<>(); convert(param, wrapper); + allLike(WrkMast.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderByField)){ if (orderByField.endsWith("$")){ orderByField = orderByField.substring(0, orderByField.length()-1); diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java index 2573e68..6bad9f4 100644 --- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java +++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java @@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.zy.asrs.entity.WrkMastLog; -import com.zy.asrs.service.WrkMastLogService; -import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.WrkMastLog; +import com.zy.asrs.service.WrkMastLogService; +import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -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<WrkMastLog> wrapper = new EntityWrapper<>(); convert(param, wrapper); + allLike(WrkMastLog.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderByField)){ if (orderByField.endsWith("$")){ orderByField = orderByField.substring(0, orderByField.length()-1); diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html index 2ea32b5..ae77b87 100644 --- a/src/main/webapp/views/locDetl/locDetl.html +++ b/src/main/webapp/views/locDetl/locDetl.html @@ -19,6 +19,11 @@ <input class="layui-input" type="text" name="loc_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> diff --git a/src/main/webapp/views/staDesc/staDesc.html b/src/main/webapp/views/staDesc/staDesc.html index ab024c2..0bd2251 100644 --- a/src/main/webapp/views/staDesc/staDesc.html +++ b/src/main/webapp/views/staDesc/staDesc.html @@ -14,7 +14,7 @@ <!-- 鎼滅储鏍� --> <div id="search-box" class="layui-form layui-card-header"> - <div class="layui-inline" style="margin-left: 40px"> + <div class="layui-inline"> <div class="layui-input-inline cool-auto-complete"> <input id="typeNo" name="type_no" class="layui-input" type="text" style="display: none"> <input id="typeNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍏ュ嚭搴撶被鍨�" onfocus=this.blur()> diff --git a/src/main/webapp/views/wrkDetl/wrkDetl.html b/src/main/webapp/views/wrkDetl/wrkDetl.html index f52cc0a..c4f7417 100644 --- a/src/main/webapp/views/wrkDetl/wrkDetl.html +++ b/src/main/webapp/views/wrkDetl/wrkDetl.html @@ -24,7 +24,11 @@ <input class="layui-input" type="text" name="wrk_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> diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html index 10f2a6f..4ed1d63 100644 --- a/src/main/webapp/views/wrkMast/wrkMast.html +++ b/src/main/webapp/views/wrkMast/wrkMast.html @@ -84,22 +84,7 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="source_sta_no" placeholder="婧愮珯" autocomplete="off"> - </div> - </div> - <div class="layui-inline"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="sta_no" placeholder="鐩爣绔�" autocomplete="off"> - </div> - </div> - <div class="layui-inline"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="source_loc_no" placeholder="婧愬簱浣�" autocomplete="off"> - </div> - </div> - <div class="layui-inline"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="loc_no" placeholder="鐩爣搴撲綅" autocomplete="off"> + <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"> </div> </div> <!-- 寰呮坊鍔� --> diff --git a/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/src/main/webapp/views/wrkMastLog/wrkMastLog.html index a6fd54d..42ebeaf 100644 --- a/src/main/webapp/views/wrkMastLog/wrkMastLog.html +++ b/src/main/webapp/views/wrkMastLog/wrkMastLog.html @@ -57,6 +57,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"> -- Gitblit v1.9.1