Browse Source

fxi

release_toaliyun_real
winter 1 year ago
parent
commit
d9313e2197
2 changed files with 12 additions and 2 deletions
  1. +6
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 6
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -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<Integer> statusList = new ArrayList<Integer>();
statusList.add(EnumRentContractStatus.PAING.getCode());
statusList.add(EnumRentContractStatus.TERMINATE.getCode());
//bq.setStatus(EnumRentContractStatus.PAING.getCode());
bq.setStatuss(statusList);
List<WxPropertyContract> propertyList = wxPropertyContractService.findList(bq);
if (null != propertyList && propertyList.size() > 0 ) {
return new ResultData(propertyList.get(0));


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -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<Integer> statusList = new ArrayList<Integer>();
//包括提前终止的,租金+物业合同是一对一的
statusList.add(EnumRentContractStatus.PAING.getCode());
statusList.add(EnumRentContractStatus.TERMINATE.getCode());
bq.setStatuss(statusList);
//bq.setStatus(EnumRentContractStatus.PAING.getCode());
List<WxPropertyContract> propertyList = wxPropertyContractService.findList(bq);
if (null != propertyList && propertyList.size() > 0 ) {
WxPropertyContract pc = propertyList.get(0);


Loading…
Cancel
Save