From b4227b5145943e067351a2a59ca34826b41d6fb7 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期二, 15 四月 2025 09:46:30 +0800 Subject: [PATCH] 界面翻译为俄语 --- src/main/java/com/zy/asrs/controller/OrderDetlController.java | 16 ++++++++++++++-- 1 files changed, 14 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 db4b088..9b2e3d5 100644 --- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java +++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java @@ -42,8 +42,20 @@ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>(); excludeTrash(param); convert(param, wrapper); - if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} - return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper)); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else { + wrapper.orderBy("create_time", false); + } + wrapper.eq("status", 1); + 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){ -- Gitblit v1.9.1