From 43ebf03e6307c8b0f3f5be1d128c85df4b6527e9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 10 Sep 2019 16:36:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8E=92=E9=99=A4=E6=9C=AA=E8=AE=A1?= =?UTF-8?q?=E7=A7=9F=E7=9A=84=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBusinessServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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; }