From d9313e2197ff6b658fee9748d6d96becd2e1b443 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 19 Aug 2024 08:36:34 +0800 Subject: [PATCH] fxi --- .../controller/contract/WxRentContractController.java | 7 ++++++- .../iformall/service/impl/WxRentContractServiceImpl.java | 7 ++++++- 2 files changed, 12 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 c566cbf18..3acf7a0ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -876,7 +876,12 @@ public class WxRentContractController extends WxContractBaseController { bq.setMerchantId(contract.getMerchantId()); bq.setRentContractId(rentContract.getId()); bq.setOperationType(EnumContractOperationType.WHOLE.getCode()); - bq.setStatus(EnumRentContractStatus.PAING.getCode()); + //包括提前终止的,租金+物业合同是一对一的 + List statusList = new ArrayList(); + statusList.add(EnumRentContractStatus.PAING.getCode()); + statusList.add(EnumRentContractStatus.TERMINATE.getCode()); + //bq.setStatus(EnumRentContractStatus.PAING.getCode()); + bq.setStatuss(statusList); List propertyList = wxPropertyContractService.findList(bq); if (null != propertyList && propertyList.size() > 0 ) { return new ResultData(propertyList.get(0)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index b388c6488..55274534c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3082,7 +3082,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { bq.setMerchantId(rentcontract.getMerchantId()); bq.setRentContractId(rentcontract.getId()); bq.setOperationType(EnumContractOperationType.WHOLE.getCode()); - bq.setStatus(EnumRentContractStatus.PAING.getCode()); + List statusList = new ArrayList(); + //包括提前终止的,租金+物业合同是一对一的 + statusList.add(EnumRentContractStatus.PAING.getCode()); + statusList.add(EnumRentContractStatus.TERMINATE.getCode()); + bq.setStatuss(statusList); + //bq.setStatus(EnumRentContractStatus.PAING.getCode()); List propertyList = wxPropertyContractService.findList(bq); if (null != propertyList && propertyList.size() > 0 ) { WxPropertyContract pc = propertyList.get(0);