From a77cf677874a6aba1784222188072dd442a862d5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 19 五月 2023 12:09:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index ad11d86..d8c9fa2 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -107,18 +107,26 @@
// }
// }
excludeTrash(param);
- convert(param, wrapper);
+ String locNo = convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ if (Cools.isEmpty(locDetlPage) || locDetlPage.getTotal()==0){
+ List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo);
+ return R.ok(locDetlPage.setRecords(locDetls));
+ }else {
+ return R.ok(locDetlPage);
+ }
// if (!row.equals("")){
// wrapper.and()
// .where("loc_no like '" +row +"%'");
// }
- return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok();
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> String convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ String locNo=null;
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -126,13 +134,15 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("locNo")) {
+ if (entry.getKey().equals("loc_no")) {
wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+ locNo=String.valueOf(entry.getValue());
} else {
wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
}
}
}
+ return locNo;
}
@RequestMapping(value = "/locDetl/add/auth")
--
Gitblit v1.9.1