From b421f805b88a71b29c44d803e7661c2b8d486a18 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 24 六月 2020 09:03:19 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 903acb9..90c99f6 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -35,6 +35,15 @@ public R stockOutList(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param){ + if (!Cools.isEmpty(param.get("modi_time"))){ + String val = String.valueOf(param.get("modi_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("modi_time"); + } + } return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class))); } -- Gitblit v1.9.1