From dbbd6ed44979da801e46fc9db0bdf7c25b694750 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 31 Aug 2024 13:22:18 +0800 Subject: [PATCH] fix --- .../controller/contract/WxRentContractController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 9efc71e8b..687dc2b41 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -837,6 +837,7 @@ public class WxRentContractController extends WxContractBaseController { bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); bq.setSortColumn(" starttime asc"); List billList = wxAllBillService.list(bq); + List validBillList = new ArrayList(); WxRentContract rc = new WxRentContract(); rc.updateTenantInfo(sales); @@ -855,11 +856,17 @@ public class WxRentContractController extends WxContractBaseController { 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(billList); + return new ResultData(validBillList); } //查询商户计租合同列表