From b3215e663b847622030b0fad3a30623dce7d13ca Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 10:48:49 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/rent/WxBillRentController.java | 5 +++++ .../com/iformall/service/impl/WxBillRentServiceImpl.java | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 718345209..cef9e449d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -142,6 +142,11 @@ public class WxBillRentController extends BaseController { @SystemControllerLog(description = "租赁押金账单-导出") public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) { wxBillRent.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillRent.setFloorForRule(dataRule.getFloorIds()); + wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); + } wxBillRentService.exportBill(request, response, wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index b4c69dbca..36d8c2205 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -527,12 +527,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { e.setPayRatio(0l); } if (StringUtils.isNoneBlank(rent.getLatePayRatio())) { + System.out.println("bid>>>>>>"+e.getId()+">>>>latepayratio>>>"+rent.getLatePayRatio()); e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); } e.setLatePayDay(rent.getLatePayDay()); - if (StringUtils.isNoneBlank(rent.getLatePayRatio())) { - e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); - } } WxBillDeposit bd = billDepositMap.get(e.getRentContractId());