From 5baf4c87da820dacbbbb7376561f00ba1163d10a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 25 May 2024 21:39:36 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/rent/WxBillDailyController.java | 2 +- .../com/iformall/controller/rent/WxBillDepositController.java | 2 +- .../com/iformall/controller/rent/WxBillOtherController.java | 2 +- .../iformall/controller/rent/WxBillOtherDepositController.java | 2 +- .../com/iformall/controller/rent/WxBillPropertyController.java | 2 +- .../controller/rent/WxBillPropertyDepositController.java | 2 +- .../java/com/iformall/controller/rent/WxBillRentController.java | 2 +- .../iformall/controller/rent/WxBillRentManageController.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 bad684c91..90f030e38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -85,7 +85,7 @@ public class WxBillDailyController extends BillBaseController { wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); } } - wxBillDaily.setSortColumns("starttime desc , merchant_id desc"); + wxBillDaily.setSortColumns("status asc,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 c3371ba44..2a8ff4f31 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -65,7 +65,7 @@ public class WxBillDepositController extends BillBaseController { } } - wxBillDeposit.setSortColumns("starttime desc , merchant_id desc"); + wxBillDeposit.setSortColumns("status asc,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 ae797d0a4..844d3574d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -63,7 +63,7 @@ public class WxBillOtherController extends BillBaseController { } } wxBillOther.updateTenantInfo(getTenantInfo()); - wxBillOther.setSortColumns("starttime desc , merchant_id desc"); + wxBillOther.setSortColumns("status asc, 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 e3eb5a675..48dea5e18 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -63,7 +63,7 @@ public class WxBillOtherDepositController extends BillBaseController { } } wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); - wxBillOtherDeposit.setSortColumns("starttime desc , merchant_id desc"); + wxBillOtherDeposit.setSortColumns("status asc, 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 ca1a119cd..d48e585e1 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("starttime desc , merchant_id desc"); + wxBillProperty.setSortColumns("status asc,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 0e540ed17..1ab018501 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -66,7 +66,7 @@ public class WxBillPropertyDepositController extends BillBaseController { } } - wxBillPropertyDeposit.setSortColumns("starttime desc , merchant_id desc"); + wxBillPropertyDeposit.setSortColumns("status asc, 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 f3e5c4fc2..0d105ea4a 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("starttime desc , merchant_id desc"); + wxBillRent.setSortColumns("status asc, 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 a93a00ff6..7c0ab8a33 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("starttime desc , merchant_id desc"); + wxBillRentManage.setSortColumns("status asc,starttime desc , merchant_id desc"); final PageInfo page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); return new ResultData(page); }