| @@ -81,10 +81,12 @@ public class WxBusinessServiceImpl implements WxBusinessService { | |||||
| query.setBusinessId((Integer) e.get("id")); | query.setBusinessId((Integer) e.get("id")); | ||||
| List<WxRentContract> rentContractList = wxRentContractMapper.select(query); | List<WxRentContract> rentContractList = wxRentContractMapper.select(query); | ||||
| for (WxRentContract dbRent:rentContractList ) { | for (WxRentContract dbRent:rentContractList ) { | ||||
| if (StringUtils.isBlank(dbRent.getRentInfo()) && | |||||
| !dbRent.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && | |||||
| !dbRent.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && | |||||
| !dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())) { | |||||
| if (StringUtils.isBlank(dbRent.getRentInfo()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { | |||||
| System.out.println("rent rentInfo is null:{}"+dbRent.getId()); | System.out.println("rent rentInfo is null:{}"+dbRent.getId()); | ||||
| continue; | continue; | ||||
| } | } | ||||
| @@ -103,10 +105,12 @@ public class WxBusinessServiceImpl implements WxBusinessService { | |||||
| pquery.setBusinessId((Integer) e.get("id")); | pquery.setBusinessId((Integer) e.get("id")); | ||||
| List<WxPropertyContract> propertyContractList = wxPropertyContractMapper.select(pquery); | List<WxPropertyContract> propertyContractList = wxPropertyContractMapper.select(pquery); | ||||
| for (WxPropertyContract dbRent:propertyContractList) { | for (WxPropertyContract dbRent:propertyContractList) { | ||||
| if (StringUtils.isBlank(dbRent.getRentInfo()) && | |||||
| !dbRent.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && | |||||
| !dbRent.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && | |||||
| !dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())) { | |||||
| if (StringUtils.isBlank(dbRent.getRentInfo()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || | |||||
| dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { | |||||
| System.out.println("property rentInfo is null:{}"+dbRent.getId()); | System.out.println("property rentInfo is null:{}"+dbRent.getId()); | ||||
| continue; | continue; | ||||
| } | } | ||||