| @@ -85,6 +85,7 @@ public class WxBillDailyController extends BillBaseController { | |||||
| wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | ||||
| } | } | ||||
| } | } | ||||
| wxBillDaily.setSortColumns("starttime desc , merchant_id desc"); | |||||
| final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -65,6 +65,7 @@ public class WxBillDepositController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillDeposit.setSortColumns("starttime desc , merchant_id desc"); | |||||
| final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -63,6 +63,7 @@ public class WxBillOtherController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillOther.updateTenantInfo(getTenantInfo()); | wxBillOther.updateTenantInfo(getTenantInfo()); | ||||
| wxBillOther.setSortColumns("starttime desc , merchant_id desc"); | |||||
| final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -63,6 +63,7 @@ public class WxBillOtherDepositController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); | wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); | ||||
| wxBillOtherDeposit.setSortColumns("starttime desc , merchant_id desc"); | |||||
| final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxBillPropertyController extends BillBaseController { | |||||
| wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | ||||
| } | } | ||||
| } | } | ||||
| wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | |||||
| wxBillProperty.setSortColumns("starttime desc , merchant_id desc"); | |||||
| PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -66,6 +66,7 @@ public class WxBillPropertyDepositController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillPropertyDeposit.setSortColumns("starttime desc , merchant_id desc"); | |||||
| PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxBillRentController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillRent.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | |||||
| wxBillRent.setSortColumns("starttime desc , merchant_id desc"); | |||||
| final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -66,7 +66,7 @@ public class WxBillRentManageController extends BillBaseController { | |||||
| wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | ||||
| } | } | ||||
| } | } | ||||
| wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); | |||||
| wxBillRentManage.setSortColumns("starttime desc , merchant_id desc"); | |||||
| final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||