From c642ca1d5aad271b22155fce6bd553533343501c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 七月 2025 09:10:10 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java | 20 +++++++++++++++++---
1 files changed, 17 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..27e8388 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,19 @@
@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);
}
+
+ @RequestMapping(value = "/endImmediately", method = RequestMethod.POST)
+ @Log(title = "活动管理", businessType = BusinessType.UPDATE,operContent = "立即结束")
+ @ApiOperation(value = "立即结束【2.0】")
+ public R endImmediately(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ return activityService.endImmediately(mgtBaseGetDto);
+
+ }
}
--
Gitblit v1.7.1