diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index d50f86655..bad684c91 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -85,6 +85,7 @@ public class WxBillDailyController extends BillBaseController { wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } + wxBillDaily.setSortColumns("starttime desc , merchant_id desc"); final PageInfo page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index 66f272b6e..c3371ba44 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -65,6 +65,7 @@ public class WxBillDepositController extends BillBaseController { } } + wxBillDeposit.setSortColumns("starttime desc , merchant_id desc"); final PageInfo page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index 654a23dc4..ae797d0a4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -63,6 +63,7 @@ public class WxBillOtherController extends BillBaseController { } } wxBillOther.updateTenantInfo(getTenantInfo()); + wxBillOther.setSortColumns("starttime desc , merchant_id desc"); final PageInfo page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index 12d810e7a..e3eb5a675 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -63,6 +63,7 @@ public class WxBillOtherDepositController extends BillBaseController { } } wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); + wxBillOtherDeposit.setSortColumns("starttime desc , merchant_id desc"); final PageInfo page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 93e8c8ba8..ca1a119cd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -65,7 +65,7 @@ public class WxBillPropertyController extends BillBaseController { wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } - wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); + wxBillProperty.setSortColumns("starttime desc , merchant_id desc"); PageInfo result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index 39b1d2e23..0e540ed17 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -66,6 +66,7 @@ public class WxBillPropertyDepositController extends BillBaseController { } } + wxBillPropertyDeposit.setSortColumns("starttime desc , merchant_id desc"); PageInfo result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 071a5da51..f3e5c4fc2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -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 page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java index cae6a907c..a93a00ff6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java @@ -66,7 +66,7 @@ public class WxBillRentManageController extends BillBaseController { wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } - wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); + wxBillRentManage.setSortColumns("starttime desc , merchant_id desc"); final PageInfo page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); return new ResultData(page); }