From 30bf3632d7c4b9789f9bcbe6d6338b9f829643bf Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 18:31:12 +0800 Subject: [PATCH] fix --- .../iformall/controller/rent/WxBillDailyController.java | 8 ++++---- .../iformall/controller/rent/WxBillOtherController.java | 8 ++++---- .../controller/rent/WxBillOtherDepositController.java | 8 ++++---- .../controller/rent/WxBillPropertyController.java | 8 ++++---- .../controller/rent/WxBillRentManageController.java | 8 ++++---- 5 files changed, 20 insertions(+), 20 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 2894f4ad0..22566b34a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -68,8 +68,8 @@ public class WxBillDailyController extends BaseController { wxBillDaily.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillDaily.setFloorForRule(dataRule.getFloorForRule()); - wxBillDaily.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillDaily.setFloorForRule(dataRule.getFloorIds()); + wxBillDaily.setBusinessForRule(dataRule.getBussinessIds()); } final PageInfo page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); return new ResultData(page); @@ -254,8 +254,8 @@ public class WxBillDailyController extends BaseController { wxBillDaily.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillDaily.setFloorForRule(dataRule.getFloorForRule()); - wxBillDaily.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillDaily.setFloorForRule(dataRule.getFloorIds()); + wxBillDaily.setBusinessForRule(dataRule.getBussinessIds()); } wxBillDailyService.exportBill(request, response, wxBillDaily); } 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 c3efef547..38e3b6e63 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -41,8 +41,8 @@ public class WxBillOtherController extends BaseController { } WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillOther.setFloorForRule(dataRule.getFloorForRule()); - wxBillOther.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillOther.setFloorForRule(dataRule.getFloorIds()); + wxBillOther.setBusinessForRule(dataRule.getBussinessIds()); } wxBillOther.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); @@ -105,8 +105,8 @@ public class WxBillOtherController extends BaseController { wxBillOther.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillOther.setFloorForRule(dataRule.getFloorForRule()); - wxBillOther.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillOther.setFloorForRule(dataRule.getFloorIds()); + wxBillOther.setBusinessForRule(dataRule.getBussinessIds()); } wxBillOtherService.exportBill(request, response, wxBillOther); } 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 3434d2818..9314ec137 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -42,8 +42,8 @@ public class WxBillOtherDepositController extends BaseController { } WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillOtherDeposit.setFloorForRule(dataRule.getFloorForRule()); - wxBillOtherDeposit.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillOtherDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillOtherDeposit.setBusinessForRule(dataRule.getBussinessIds()); } wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); @@ -116,8 +116,8 @@ public class WxBillOtherDepositController extends BaseController { wxBillDeposit.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillDeposit.setFloorForRule(dataRule.getFloorForRule()); - wxBillDeposit.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds()); } wxBillOtherDepositService.exportBill(request, response, wxBillDeposit); } 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 c410e6b6c..cc457f8b7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -43,8 +43,8 @@ public class WxBillPropertyController extends BaseController { wxBillProperty.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillProperty.setFloorForRule(dataRule.getFloorForRule()); - wxBillProperty.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillProperty.setFloorForRule(dataRule.getFloorIds()); + wxBillProperty.setBusinessForRule(dataRule.getBussinessIds()); } wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); @@ -129,8 +129,8 @@ public class WxBillPropertyController extends BaseController { wxBillProperty.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillProperty.setFloorForRule(dataRule.getFloorForRule()); - wxBillProperty.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillProperty.setFloorForRule(dataRule.getFloorIds()); + wxBillProperty.setBusinessForRule(dataRule.getBussinessIds()); } wxBillPropertyService.exportBill(request, response, wxBillProperty); } 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 3528d2c64..a8affe685 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java @@ -44,8 +44,8 @@ public class WxBillRentManageController extends BaseController { wxBillRentManage.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillRentManage.setFloorForRule(dataRule.getFloorForRule()); - wxBillRentManage.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillRentManage.setFloorForRule(dataRule.getFloorIds()); + wxBillRentManage.setBusinessForRule(dataRule.getBussinessIds()); } wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); @@ -138,8 +138,8 @@ public class WxBillRentManageController extends BaseController { wxBillRent.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { - wxBillRent.setFloorForRule(dataRule.getFloorForRule()); - wxBillRent.setBusinessForRule(dataRule.getBusinessForRule()); + wxBillRent.setFloorForRule(dataRule.getFloorIds()); + wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); } wxBillRentManageService.exportBill(request, response, wxBillRent); }