From 7a22a1aa3377d1d63f197d8a7e030c6136263555 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 13:43:59 +0800
Subject: [PATCH] 全文搜索
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 6 +++---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 2 +-
src/main/java/com/zy/common/web/BaseController.java | 9 +++------
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 ++---
src/main/webapp/views/pakStore/locDetlQuery.html | 2 +-
src/main/resources/application.yml | 4 ++--
6 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index cd3b2c7..6b27d3d 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -35,7 +35,7 @@
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- return R.ok(locDetlService.getStockOut(new Page<LocDetl>(curr, limit).setCondition(param)));
+ return R.ok(locDetlService.getStockOut(toPage(curr, limit, param)));
}
@RequestMapping(value = "/locDetl/list/auth")
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 2e5c024..a1c4763 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -3,17 +3,17 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
public interface LocDetlMapper extends BaseMapper<LocDetl> {
- List<LocDetl> getStockOutPage(@Param("pageNumber")int pageNumber, @Param("pageSize")int pageSize, @Param("loc_no") Object loc_no, @Param("matnr") Object matnr);
+ List<LocDetl> getStockOutPage(Map<String, Object> map);
- Integer getStockOutPageCount(@Param("loc_no") Object loc_no, @Param("matnr") Object matnr);
+ Integer getStockOutPageCount(Map<String, Object> map);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 1d44447..593daa5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -12,9 +12,8 @@
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCurrent(), page.getSize()
- , page.getCondition().get("loc_no"), page.getCondition().get("matnr")));
- page.setTotal(baseMapper.getStockOutPageCount(page.getCondition().get("loc_no"), page.getCondition().get("matnr")));
+ page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
+ page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
return page;
}
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 7795ae8..a3f319e 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -54,12 +54,9 @@
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()));
+ param.put("pageNumber", Integer.parseInt(String.valueOf(param.get("curr"))));
+ param.put("pageSize", Integer.parseInt(String.valueOf(param.get("limit"))));
+ page.setCondition(param);
return page;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a57f7ef..6a612ee 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,8 +28,8 @@
mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/logs
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 2e0a168..07ef6cd 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -56,7 +56,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1