|
|
@@ -5,6 +5,7 @@ import com.iformall.common.Result; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.common.ResultData; |
|
|
import com.iformall.domain.po.WxActivity; |
|
|
import com.iformall.domain.po.WxActivity; |
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
|
|
import com.iformall.enums.EnumActivityStatus; |
|
|
import com.iformall.service.WxActivityService; |
|
|
import com.iformall.service.WxActivityService; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
@@ -42,9 +43,7 @@ public class WxActivityController extends BaseController { |
|
|
public ResultData list(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) { |
|
|
public ResultData list(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) { |
|
|
logger.debug("[" + getIpAddr() + "] WxActivityController::list"); |
|
|
logger.debug("[" + getIpAddr() + "] WxActivityController::list"); |
|
|
if (null == wxActivity) wxActivity = new WxActivity(); |
|
|
if (null == wxActivity) wxActivity = new WxActivity(); |
|
|
if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) { |
|
|
|
|
|
wxActivity.setStatus(null); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
wxActivity.setStatus(EnumActivityStatus.INJECT_ONLINE.getCode()); |
|
|
wxActivity.updateTenantInfo(getTenantInfo()); |
|
|
wxActivity.updateTenantInfo(getTenantInfo()); |
|
|
wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); |
|
|
wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); |
|
|
final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); |
|
|
final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); |
|
|
|