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/OrderLogController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
index fcd3611..029052a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.entity.OrderType;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.common.annotation.CacheData;
@@ -184,7 +185,23 @@
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@PostMapping("/orderLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderLogService.list(), OrderLog.class), response);
+ String ioModel = map.getOrDefault("ioModel", "").toString();
+ map.remove("ioModel");
+
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
+ QueryWrapper<OrderLog> queryWrapper = pageParam.buildWrapper(true);
+
+ List<OrderLog> list = orderLogService.list(queryWrapper);
+ if (!Cools.isEmpty(ioModel)) {
+ 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());
+ }
+ queryWrapper.in("order_type", types);
+ list = orderLogService.list(queryWrapper);
+ }
+ ExcelUtil.build(ExcelUtil.create(list, OrderLog.class), response);
}
}
--
Gitblit v1.9.1