From 5f14e63a2400456055086632e027951086114648 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 06 十二月 2024 15:07:04 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index 296c619..4992fa8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -199,15 +199,20 @@
@PostMapping("/order/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
String ioModel = map.getOrDefault("ioModel", "").toString();
- List<Order> list = orderService.list();
+ map.remove("ioModel");
+
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
+ QueryWrapper<Order> queryWrapper = pageParam.buildWrapper(true);
+
+ List<Order> list = orderService.list(queryWrapper);
if (!Cools.isEmpty(ioModel)) {
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
ArrayList<Long> types = new ArrayList<>();
for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, ioModel.equals("in") ? 1 : 2))) {
types.add(orderType.getId());
}
- wrapper.in(Order::getOrderType, types);
- list = orderService.list(wrapper);
+ queryWrapper.in("order_type", types);
+ list = orderService.list(queryWrapper);
}
ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
}
--
Gitblit v1.9.1