|
|
@@ -9,6 +9,7 @@ import com.iformall.domain.po.WxLegionActivity; |
|
|
import com.iformall.domain.po.base.BaseEntity.SortField; |
|
|
import com.iformall.domain.po.base.BaseEntity.SortField; |
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
import com.iformall.enums.EnumLegionActivityStatus; |
|
|
import com.iformall.enums.EnumLegionActivityStatus; |
|
|
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
import com.iformall.service.WxLegionActivityService; |
|
|
import com.iformall.service.WxLegionActivityService; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
@@ -50,6 +51,11 @@ public class WxLegionActivityController extends BaseController { |
|
|
wxLegionActivity.setSortColumns(SortField.CreateDate_DESC); |
|
|
wxLegionActivity.setSortColumns(SortField.CreateDate_DESC); |
|
|
wxLegionActivity.setNeedCount(false); |
|
|
wxLegionActivity.setNeedCount(false); |
|
|
wxLegionActivity.setMerchantId(getLoginBUser().getMerchantId()); |
|
|
wxLegionActivity.setMerchantId(getLoginBUser().getMerchantId()); |
|
|
|
|
|
|
|
|
|
|
|
//已开始 |
|
|
|
|
|
if(EnumLegionActivityStatus.ON_LINE.getCode().equals(wxLegionActivity.getStatus())){ |
|
|
|
|
|
wxLegionActivity.setStartStatus(EnumYesOrNo.YES.getCode()); |
|
|
|
|
|
} |
|
|
final PageInfo<WxLegionActivity> page = wxLegionActivityService.listAsPage(wxLegionActivity,pageNum, pageSize); |
|
|
final PageInfo<WxLegionActivity> page = wxLegionActivityService.listAsPage(wxLegionActivity,pageNum, pageSize); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
|