From 7e8c8abedab8d33ea5faff80545e566aa71306d6 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 21 五月 2024 14:48:11 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java index 58aa710..4a7d056 100644 --- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java +++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java @@ -57,6 +57,30 @@ return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper)); } + @RequestMapping(value = "/wrkMast/list/auth/dbList") + @ManagerAuth + public R dbList(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam(required = false)String orderByField, + @RequestParam(required = false)String orderByType, + @RequestParam(required = false)String condition, + @RequestParam Map<String, Object> param){ + excludeTrash(param); + EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>(); + convert(param, wrapper); + allLike(AgvWrkMast.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){ + if (orderByField.endsWith("$")){ + orderByField = orderByField.substring(0, orderByField.length()-1); + } + wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); + }else { + wrapper.orderBy("io_time", false); + } + wrapper.in("io_type",108,111,112); + return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper)); + } + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ String val = String.valueOf(entry.getValue()); -- Gitblit v1.9.1