From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
index 1508dbf..90fd209 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
@@ -20,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigInteger;
import java.util.List;
import java.util.stream.Collectors;
@@ -117,16 +118,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtActivityOrderPageVo> page = new Page<>();
- if(mgtShopOrderPageDto.getPageSize() > 5000){
- page.setSize(5000);
- page.setCurrent(1);
- }else{
- page.setSize(mgtShopOrderPageDto.getPageSize());
- page.setCurrent(mgtShopOrderPageDto.getPageNum());
- }
+ page.setSize(Integer.MAX_VALUE);
+ page.setCurrent(1);
List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
ExcelUtil<MgtActivityOrderPageVo> util = new ExcelUtil<MgtActivityOrderPageVo>(MgtActivityOrderPageVo.class);
- util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表");
+ util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表", "秒杀订单列表");
}
@RequestMapping(value = "/pageMgtShopOrder", method = RequestMethod.POST)
@@ -147,16 +143,11 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtShopOrderPageVo> page = new Page<>();
- if(mgtShopOrderPageDto.getPageSize() > 5000){
- page.setSize(5000);
- page.setCurrent(1);
- }else{
- page.setSize(mgtShopOrderPageDto.getPageSize());
- page.setCurrent(mgtShopOrderPageDto.getPageNum());
- }
+ page.setSize(Integer.MAX_VALUE);
+ page.setCurrent(1);
List<MgtShopOrderPageVo> shopOrderPageVoList = orderService.pageMgtShopOrder(page,mgtShopOrderPageDto);
ExcelUtil<MgtShopOrderPageVo> util = new ExcelUtil<MgtShopOrderPageVo>(MgtShopOrderPageVo.class);
- util.exportExcel(response, shopOrderPageVoList, "门店订单列表");
+ util.exportExcel(response, shopOrderPageVoList, "门店订单列表", "门店订单列表");
}
@RequestMapping(value = "/getMgtOrderDetail", method = RequestMethod.POST)
--
Gitblit v1.7.1