修改bug

Pu Zhibing

2 天以前 cead7b98d5cebc0825b919799e23732877361de0

 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,8 +96,13 @@
    @ApiOperation(value = "导出活动参与记录列表")
    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, "商品列表");
@@ -104,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);

    }
}