From 06a901e11f9ec144b709efa3610f5abd0e5936d6 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期日, 07 四月 2024 09:18:08 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index bac2eca..3f53cf3 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -98,6 +98,30 @@ return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper)); } + // 鎵�鏈夊叆搴撹鍗� + @RequestMapping(value = "/order/detls/in/page/auth") + @ManagerAuth + public R orderDetls(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10000")Integer limit, + @RequestParam(required = false)String orderByField, + @RequestParam(required = false)String orderByType, + @RequestParam Map<String, Object> param){ + EntityWrapper<Order> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else { + wrapper.orderBy("settle").orderBy("create_time", false); + } + wrapper.eq("status", 1); + List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1)); + List<Long> docIds = new ArrayList<>(); + for (DocType pakin : pakins) { + docIds.add(pakin.getDocId()); + } + wrapper.in("doc_type",docIds); + return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper)); + } + @RequestMapping(value = "/order/detl/all/auth") @ManagerAuth public R head(@RequestParam Long orderId){ -- Gitblit v1.9.1