From b09865e3b4e43ec7110ca7472188478fcdb6fb0f Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 22 三月 2023 09:41:32 +0800 Subject: [PATCH] #库存档案同步上报 --- src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java index 28178c6..f8981e9 100644 --- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java +++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java @@ -44,18 +44,18 @@ return R.ok(basCrnErrorService.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); } } } - @RequestMapping(value = "/basCrnError/add/auth") @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜娣诲姞") public R add(BasCrnError basCrnError) { -- Gitblit v1.9.1