|
|
@@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.domain.po.BaseEntity; |
|
|
import com.iformall.domain.po.BaseEntity; |
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
import com.iformall.service.WxBillActionService; |
|
|
import com.iformall.service.WxBillActionService; |
|
|
|
|
|
import com.iformall.utils.DateUtils; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiOperation; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
import org.springframework.web.bind.annotation.ModelAttribute; |
|
|
import org.springframework.web.bind.annotation.ModelAttribute; |
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
@@ -59,7 +61,13 @@ public class WxBillActionController extends BaseController { |
|
|
wxBillAction.setTenantId(getTenantId()); |
|
|
wxBillAction.setTenantId(getTenantId()); |
|
|
wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC); |
|
|
wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC); |
|
|
PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); |
|
|
PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); |
|
|
|
|
|
if(result != null && CollectionUtils.isNotEmpty(result.getList())){ |
|
|
|
|
|
|
|
|
|
|
|
// DateUtils.getDaySet() |
|
|
|
|
|
// for (WxBillAction action:result.getList()) { |
|
|
|
|
|
// |
|
|
|
|
|
// } |
|
|
|
|
|
} |
|
|
return new ResultData(result); |
|
|
return new ResultData(result); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |