From 080fdceed464c56f43633e85daeaf929d40496af Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 18 十月 2023 13:16:07 +0800 Subject: [PATCH] 连接ERP 获取ERP库存信息 --- src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java index f7331c4..d1a65dd 100644 --- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java +++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java @@ -46,14 +46,15 @@ return R.ok(basCrnStatusService.selectPage(new Page<>(curr, limit), wrapper)); } - private void convert(Map<String, Object> map, EntityWrapper wrapper){ + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ - if (entry.getKey().endsWith(">")) { - wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue()))); - } else if (entry.getKey().endsWith("<")) { - wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue()))); + String val = String.valueOf(entry.getValue()); + if (val.contains(RANGE_TIME_LINK)){ + String[] dates = val.split(RANGE_TIME_LINK); + wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); + wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); } else { - wrapper.eq(entry.getKey(), String.valueOf(entry.getValue())); + wrapper.like(entry.getKey(), val); } } } -- Gitblit v1.9.1