From ad3be6a7eb155e5fbda2e7febd9789e4a6b753f4 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 31 Aug 2024 19:49:40 +0800 Subject: [PATCH] fix --- .../contract/WxRentContractController.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 687dc2b41..38021b1ea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -837,35 +837,38 @@ public class WxRentContractController extends WxContractBaseController { bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); bq.setSortColumn(" starttime asc"); List billList = wxAllBillService.list(bq); + if (null == billList || billList.size() <= 0 ) { + return new ResultData(); + } List validBillList = new ArrayList(); WxRentContract rc = new WxRentContract(); rc.updateTenantInfo(sales); rc.setId(sales.getRentContractId()); List salesList = wxRentContractService.getContractSales(rc); - if (null != salesList && salesList.size() > 0 && null != billList && billList.size() > 0 ) { - Map billSalesMap = new HashMap(); + Map billSalesMap = new HashMap(); + if (null != salesList && salesList.size() > 0) { + for (int i = 0 ; i < salesList.size() ; i ++ ) { WxRentContractRevenueSales rs = salesList.get(i); billSalesMap.put(rs.getBillId(), rs); } - - for (int i = 0 ; i < billList.size() ; i ++) { - WxAllBill bill = billList.get(i); - WxRentContractRevenueSales s = billSalesMap.get(bill.getId()); - if (null != s) { - bill.setSales(s.getSaleMoney()); - bill.setSalesTime(s.getUpdateTime()); - if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) { - // - }else { - validBillList.add(bill); - } - }else { - validBillList.add(bill); - } - } } + for (int i = 0 ; i < billList.size() ; i ++) { + WxAllBill bill = billList.get(i); + WxRentContractRevenueSales s = billSalesMap.get(bill.getId()); + if (null != s) { + bill.setSales(s.getSaleMoney()); + bill.setSalesTime(s.getUpdateTime()); + if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) { + // + }else { + validBillList.add(bill); + } + }else { + validBillList.add(bill); + } + } return new ResultData(validBillList); }