From 6f088dc1cb716e345da064a5e89f148bd248c75d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 30 四月 2024 10:54:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index cab72f4..cf452b0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -130,25 +130,26 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
- }
- List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
- List<Long> docIds = new ArrayList<>();
- for (DocType pakin : pakins) {
- docIds.add(pakin.getDocId());
- }
- EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
- List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
- List<String> orderNos = new ArrayList<>();
- for (Order order : orders) {
- orderNos.add(order.getOrderNo());
- }
- wrapper.in("order_no",orderNos);
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+// EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+// wrapper.orderBy("create_time", false);
+// }
+// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+// List<Long> docIds = new ArrayList<>();
+// for (DocType pakin : pakins) {
+// docIds.add(pakin.getDocId());
+// }
+// EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
+// List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
+// List<String> orderNos = new ArrayList<>();
+// for (Order order : orders) {
+// orderNos.add(order.getOrderNo());
+// }
+// wrapper.in("order_no",orderNos);
+// return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/order/detl/all/auth")
--
Gitblit v1.9.1