diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 2a762ac06..e82428a28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -81,10 +81,12 @@ public class WxBusinessServiceImpl implements WxBusinessService { query.setBusinessId((Integer) e.get("id")); List rentContractList = wxRentContractMapper.select(query); 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()); continue; } @@ -103,10 +105,12 @@ public class WxBusinessServiceImpl implements WxBusinessService { pquery.setBusinessId((Integer) e.get("id")); List propertyContractList = wxPropertyContractMapper.select(pquery); 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()); continue; }