From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 21 八月 2023 19:03:55 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java index 81b5202..3023797 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java @@ -34,7 +34,7 @@ * @Date 2023/6/14 10:17 * @Version 1.0 */ -@Api(value = "平台端活动相关接口", tags = "平台端活动相关接口", description = "平台端活动相关接口") +@Api(value = "管理后台活动相关接口", tags = "管理后台活动相关接口", description = "管理后台活动相关接口") @RestController @RequestMapping("/mgt/activity") public class MgtActivityController { @@ -93,10 +93,15 @@ @RequestMapping(value = "/exportPageMgtActivityRecord", method = RequestMethod.POST) @ApiOperation(value = "导出活动参与记录列表") - public void exportPageMgtActivityRecord(@RequestBody MgtActivityRecordPageDto mgtActivityRecordPageDto, HttpServletResponse response) { + public void exportPageMgtActivityRecord( MgtActivityRecordPageDto mgtActivityRecordPageDto, HttpServletResponse response) { Page<MgtActivityRecordPageVo> page = new Page<>(); - page.setSize(2000); - page.setCurrent(1); + if(mgtActivityRecordPageDto.getPageSize() > 5000){ + page.setSize(5000); + page.setCurrent(1); + }else{ + page.setSize(mgtActivityRecordPageDto.getPageSize()); + page.setCurrent(mgtActivityRecordPageDto.getPageNum()); + } List<MgtActivityRecordPageVo> activityRecordPageVoList = activityService.pageMgtActivityRecord(page,mgtActivityRecordPageDto); ExcelUtil<MgtActivityRecordPageVo> util = new ExcelUtil<MgtActivityRecordPageVo>(MgtActivityRecordPageVo.class); util.exportExcel(response, activityRecordPageVoList, "商品列表"); -- Gitblit v1.7.1