|
|
@@ -82,12 +82,15 @@ public class WxBusinessServiceImpl implements WxBusinessService { |
|
|
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()) || |
|
|
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())) { |
|
|
|
|
|
|
|
|
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; |
|
|
} |
|
|
} |
|
|
|
|
|
logger.info("业态分析>>>>>>>>>>>>>>>>>>租金合同ID:" + dbRent.getId()); |
|
|
List<WxBillRent> previewBill = new ArrayList<>(); |
|
|
List<WxBillRent> previewBill = new ArrayList<>(); |
|
|
WxBillRent preview = new WxBillRent(); |
|
|
WxBillRent preview = new WxBillRent(); |
|
|
preview.setStarttime(dbRent.getRentalStartDate()); |
|
|
preview.setStarttime(dbRent.getRentalStartDate()); |
|
|
@@ -104,12 +107,15 @@ public class WxBusinessServiceImpl implements WxBusinessService { |
|
|
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()) || |
|
|
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())) { |
|
|
|
|
|
|
|
|
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; |
|
|
} |
|
|
} |
|
|
|
|
|
logger.info("业态分析>>>>>>>>>>>>>>>>>>物业合同ID:" + dbRent.getId()); |
|
|
List<WxBillProperty> previewBill = new ArrayList<>(); |
|
|
List<WxBillProperty> previewBill = new ArrayList<>(); |
|
|
WxBillProperty preview = new WxBillProperty(); |
|
|
WxBillProperty preview = new WxBillProperty(); |
|
|
preview.setStarttime(dbRent.getRentalStartDate()); |
|
|
preview.setStarttime(dbRent.getRentalStartDate()); |
|
|
|