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 0c9ca65e8..26c69c940 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -685,15 +685,20 @@ public class WxRentContractController extends WxContractBaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); if (null == wxRentContract) wxRentContract = new WxRentContract(); wxRentContract.updateTenantInfo(getTenantInfo()); - //正常状态, 物业合同 - if (validStatus != null && 1 == validStatus) { - wxRentContract.setStatuss(EnumRentContractStatus.getValidStatus()); - //续签的合同,包括正常到期 - }else if (validStatus != null && 2== validStatus) { - List statuss = EnumRentContractStatus.getValidStatus(); - statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); - wxRentContract.setStatuss(statuss); + if (null != wxRentContract.getOnlyPropertyContractId() && wxRentContract.getOnlyPropertyContractId() > 0 ) { + wxRentContract.setId(wxRentContract.getOnlyPropertyContractId()); + } else { + //正常状态, 物业合同 + if (validStatus != null && 1 == validStatus) { + wxRentContract.setStatuss(EnumRentContractStatus.getValidStatus()); + //续签的合同,包括正常到期 + }else if (validStatus != null && 2== validStatus) { + List statuss = EnumRentContractStatus.getValidStatus(); + statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); + wxRentContract.setStatuss(statuss); + } } + wxRentContract.setSortColumns(SortField.Createtime_DESC); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 6ac2f71fb..184d393f0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -533,5 +533,8 @@ public class WxRentContract extends TenantEntity { @TableField(exist = false) private List merchantIds; + + @TableField(exist = false) + private Long onlyPropertyContractId; }