From 2a4eb0b00eb4dce8ca7b27d798bda1963b593e63 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期四, 10 七月 2025 09:16:03 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderDetlController.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java index 7fad7c2..1da5ec6 100644 --- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java +++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java @@ -46,7 +46,16 @@ wrapper.orderBy("create_time", false); } wrapper.eq("status", 1); - return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper)); + Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper); + return R.ok(orderDetlPage); + } + + @RequestMapping(value = "/orderDetl/pakout/list/auth") + @ManagerAuth + public R pakoutList(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam Map<String, Object> param){ + return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class))); } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ @@ -104,7 +113,7 @@ public R query(String condition) { EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>(); wrapper.like("id", condition); - Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper); + Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10000), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (OrderDetl orderDetl : page.getRecords()){ Map<String, Object> map = new HashMap<>(); -- Gitblit v1.9.1