|
|
|
@@ -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<Integer> 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<Integer> 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)); |
|
|
|
} |
|
|
|
|