From 42a908a0a60b27d016231d062bac08be1b64d3e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 三月 2021 09:49:35 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
index be082ee..2ff8b0b 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
@@ -43,13 +43,18 @@
Object nodeId = param.get("node_id");
if (Cools.isEmpty(nodeId)) {
nodeId = getOriginNode().getId();
+ param.put("node_id", String.valueOf(nodeId));
}
- return R.ok(locDetlService.getPage(new Page<>(curr, limit)
- , String.valueOf(nodeId)
- , param.get("loc_no")
- , param.get("matnr")
- , param.get("maktx"))
- );
+ if (!Cools.isEmpty(param.get("update_time"))){
+ String val = String.valueOf(param.get("update_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("update_time");
+ }
+ }
+ return R.ok(locDetlService.getPage(toPage(curr, limit, param, LocDetl.class)));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
--
Gitblit v1.9.1