From fc2f50d22c5a6828d97cc1dddce10b51cb128e6b Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 16:10:49 +0800 Subject: [PATCH] fix --- .../rent/WxBillRentManageController.java | 5 +++++ .../mapper/WxBillRentManageMapper.xml | 18 ++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) 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 c3b6b6506..769a3632d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java @@ -136,6 +136,11 @@ public class WxBillRentManageController extends BaseController { @SystemControllerLog(description = "租赁押金账单-导出") public void exportBill(@ModelAttribute WxBillRentManage wxBillRent, HttpServletRequest request, HttpServletResponse response) { wxBillRent.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillRentManage.setFloorForRule(dataRule.getFloorForRule()); + wxBillRentManage.setBusinessForRule(dataRule.getBusinessForRule()); + } wxBillRentManageService.exportBill(request, response, wxBillRent); } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index 9a9a859dc..dd027c28e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -117,11 +117,11 @@ and br.`manage_fee_type` = #{manageFeeType} - and br.merchant_id in - - #{midItem} - - + and br.merchant_id in + + #{midItem} + + @@ -130,14 +130,8 @@ case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime, - br.freeze,br.service_charge_pay,br.manage_fee_type - - r.merchant_name,r.type as rent_type,r.`late_pay_ratio` - - - + br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio` from wx_bill_rent_manage br - left join wx_rent_contract r on br.rent_contract_id=r.id order by ${sortColumns}