diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java index da5e1831e..0681f7d46 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java @@ -183,4 +183,10 @@ public class WxVtwoActivityGrant extends TenantEntity { @TableField(exist = false) private Integer awardLimit; + + @TableField(exist = false) + private Integer begin; + + @TableField(exist = false) + private Integer limit; } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java index 90294b508..8b01de2ed 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java @@ -1,6 +1,8 @@ package com.iformall.service.impl; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.handler.inter.IExcelExportServer; + import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -44,7 +46,7 @@ import static java.util.stream.Collectors.*; */ @Service public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl - implements WxVtwoPrizeDrawActivityService{ + implements WxVtwoPrizeDrawActivityService,IExcelExportServer{ @Autowired private WxVtwoPrizeDrawActivityMapper wxVtwoPrizeDrawActivityMapper; @@ -620,12 +622,18 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl getExportTwoDataNew(WxVtwoActivityGrant activityGrant) { + WxVtwoPrizeDrawActivity activity = this.getById(activityGrant.getActivityId(), activityGrant.getTenantId()); if(activity == null){ throw new MallinkException(Result.ERROR,"未查询到活动"); } - - List activityGrantExportList = wxVtwoActivityGrantExportTwoService.findActivityGrantExportList(activityGrant.getActivityId(),activityGrant.getTenantId()); + List activityGrantExportList = wxVtwoActivityGrantExportTwoService.findActivityGrantExportList(activityGrant.getActivityId(),activityGrant.getTenantId()); if(activityGrantExportList != null && !activityGrantExportList.isEmpty()){ for (int k = 0 ; k < activityGrantExportList.size(); k++) { WxVtwoActivityPrizeDrawMainData aget = activityGrantExportList.get(k); @@ -716,10 +724,18 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl selectListForExcelExport(Object queryParams, int page) { + WxVtwoActivityGrant activityGrant = (WxVtwoActivityGrant) queryParams; + activityGrant.setBegin((page-1)*20000); + activityGrant.setLimit(20000); + List activityGrantExportList = getExportTwoDataNew(activityGrant); + return activityGrantExportList; + } + }