From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 0a79de4..6267469 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
@@ -7,6 +7,7 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.MgtActivityEditDto;
+import com.ruoyi.goods.domain.dto.MgtActivityListDto;
import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
import com.ruoyi.goods.domain.vo.MgtActivityGetVo;
@@ -95,9 +96,12 @@
@ApiOperation(value = "导出活动参与记录列表")
public void exportPageMgtActivityRecord( MgtActivityRecordPageDto mgtActivityRecordPageDto, HttpServletResponse response) {
Page<MgtActivityRecordPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ 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);
@@ -106,9 +110,9 @@
@RequestMapping(value = "/listMgtActivity", method = RequestMethod.POST)
@ApiOperation(value = "获取活动列表")
- public R<List<MgtActivityListVo>> listMgtActivity() {
+ public R<List<MgtActivityListVo>> listMgtActivity(@RequestBody MgtActivityListDto mgtActivityListDto) {
- List<MgtActivityListVo> activityListVoList = activityService.listMgtActivity();
+ List<MgtActivityListVo> activityListVoList = activityService.listMgtActivity(mgtActivityListDto);
return R.ok(activityListVoList);
}
}
--
Gitblit v1.7.1