From 404d4ddadf135189b8818c85f58cd0c8c4835913 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 九月 2023 16:41:57 +0800
Subject: [PATCH] #货主转换，货物形态转换搜索修复
---
src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java | 4 ++--
src/main/java/com/zy/asrs/controller/LocDetlController.java | 22 +++++++++++++++-------
src/main/webapp/views/pakStore/turnOverQuery.html | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 7 ++++---
src/main/java/com/zy/asrs/entity/LocOwner.java | 2 +-
5 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 81f7717..5dc97e7 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -338,22 +338,30 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
+ Integer owner = null;
+ Integer payment = null;
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
if(locOwner == null){
return R.error("鍙傛暟鏈夎锛�");
}
param.remove("owner$");
- param.put("owner",locOwner.getId());
+ owner = locOwner.getId();
+ }
+ if (param.get("payment$") != null && param.get("payment$") != ""){
+ if ( param.get("payment$").equals("浠撳偍") ){
+ payment = 1;
+ } else if (param.get("payment$").equals("浠ｉ噰")) {
+ payment = 0;
+ }
+ param.remove("payment$");
}
LocDetlDTO locDetlDTO = new LocDetlDTO();
locDetlDTO.setPageSize(limit);
locDetlDTO.setPageNumber(curr);
String locNo = String.valueOf(param.get("locNo"));
- String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
- String payment = String.valueOf(param.get("payment"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
}
@@ -381,20 +389,20 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
+ Integer owner = null;
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
if(locOwner == null){
return R.error("鍙傛暟鏈夎锛�");
}
param.remove("owner$");
- param.put("owner",locOwner.getId());
+ owner = locOwner.getId();
}
LocDetlDTO locDetlDTO = new LocDetlDTO();
locDetlDTO.setPageSize(limit);
locDetlDTO.setPageNumber(curr);
String locNo = String.valueOf(param.get("locNo"));
- String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
diff --git a/src/main/java/com/zy/asrs/entity/LocOwner.java b/src/main/java/com/zy/asrs/entity/LocOwner.java
index a1573a0..486e3f6 100644
--- a/src/main/java/com/zy/asrs/entity/LocOwner.java
+++ b/src/main/java/com/zy/asrs/entity/LocOwner.java
@@ -16,7 +16,7 @@
@ApiModelProperty(value= "")
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
@ApiModelProperty(value= "")
private String owner;
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
index 61c3820..3563fc9 100644
--- a/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
@@ -10,6 +10,6 @@
private Integer row;
private String locNo;
private String matnr;
- private String owner;
- private String payment;
+ private Integer owner;
+ private Integer payment;
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0d0e3b5..be5981c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -514,10 +514,10 @@
<if test="matnr != null and matnr !='' ">
and t.matnr like '%' + #{matnr} + '%'
</if>
- <if test="owner != null and owner !='' ">
- and t.owner like '%' + #{owner} + '%'
+ <if test="owner != null">
+ and t.owner = #{owner}
</if>
- <if test="payment != null and payment !='' ">
+ <if test="payment != null">
and t.payment = #{payment}
</if>
@@ -548,6 +548,7 @@
SELECT * FROM asr_loc_detl_all
) t
WHERE 1=1
+
<include refid="selectAllSql"></include>
) a
WHERE a.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
diff --git a/src/main/webapp/views/pakStore/turnOverQuery.html b/src/main/webapp/views/pakStore/turnOverQuery.html
index 47f5bbb..1d80462 100644
--- a/src/main/webapp/views/pakStore/turnOverQuery.html
+++ b/src/main/webapp/views/pakStore/turnOverQuery.html
@@ -64,7 +64,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="payment" placeholder="璐х墿褰㈡��" autocomplete="off">
+ <input class="layui-input" type="text" name="payment$" placeholder="璐х墿褰㈡��" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
--
Gitblit v1.9.1