From 1286f6fd5625d3d058d1dcff11b8fda303d6c455 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 11 三月 2025 10:28:43 +0800 Subject: [PATCH] 四期 --- src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java index 86e4584..3c94b0b 100644 --- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java +++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java @@ -44,20 +44,20 @@ 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 + @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜娣诲姞") public R add(BasCrnError basCrnError) { basCrnError.setModiUser(getUserId()); basCrnError.setModiTime(new Date()); @@ -68,10 +68,10 @@ } @RequestMapping(value = "/basCrnError/update/auth") - @ManagerAuth + @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜淇敼") public R update(BasCrnError basCrnError){ if (Cools.isEmpty(basCrnError) || null==basCrnError.getErrorCode()){ - return R.error(); + return R.error("璇锋眰鍙傛暟涓虹┖"); } basCrnError.setModiUser(getUserId()); basCrnError.setModiTime(new Date()); @@ -80,11 +80,11 @@ } @RequestMapping(value = "/basCrnError/delete/auth") - @ManagerAuth + @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜鍒犻櫎") public R delete(@RequestParam String param){ List<BasCrnError> list = JSONArray.parseArray(param, BasCrnError.class); if (Cools.isEmpty(list)){ - return R.error(); + return R.error("璇锋眰鍙傛暟涓虹┖"); } for (BasCrnError entity : list){ basCrnErrorService.delete(new EntityWrapper<>(entity)); @@ -93,7 +93,7 @@ } @RequestMapping(value = "/basCrnError/export/auth") - @ManagerAuth + @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜瀵煎嚭") public R export(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>(); -- Gitblit v1.9.1