|
|
@@ -55,8 +55,8 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract |
|
|
.filter(p -> p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode()) || |
|
|
.filter(p -> p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode()) || |
|
|
p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())) |
|
|
p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())) |
|
|
.findFirst().orElseGet(null); |
|
|
|
|
|
data.put("property", wxPropertyContract); |
|
|
|
|
|
|
|
|
.findFirst().orElse(null); |
|
|
|
|
|
data.put("property", new WxPropertyContract()); |
|
|
if (wxPropertyContract != null) { |
|
|
if (wxPropertyContract != null) { |
|
|
Map<String, Object> property = wxPropertyContractService.getById(wxPropertyContract.getRentContractId()); |
|
|
Map<String, Object> property = wxPropertyContractService.getById(wxPropertyContract.getRentContractId()); |
|
|
data.put("property", property); |
|
|
data.put("property", property); |
|
|
|