|
|
|
@@ -290,13 +290,16 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
record.setPreviewBillRentList(billList); |
|
|
|
|
|
|
|
//生成预览账单 |
|
|
|
if(CollectionUtils.isEmpty(billList) || |
|
|
|
(!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod()) |
|
|
|
||!wxPropertyContract.getPrice().equals(record.getPrice()) |
|
|
|
||!wxPropertyContract.getDeposit().equals(record.getDeposit()) |
|
|
|
||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod()) |
|
|
|
|| !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd")) |
|
|
|
)){ |
|
|
|
// if(CollectionUtils.isEmpty(billList) || |
|
|
|
// (!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod()) |
|
|
|
// ||!wxPropertyContract.getPrice().equals(record.getPrice()) |
|
|
|
// ||!wxPropertyContract.getDeposit().equals(record.getDeposit()) |
|
|
|
// ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod()) |
|
|
|
// || !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd")) |
|
|
|
// )){ |
|
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { |
|
|
|
//删除预账单,重新生成 |
|
|
|
wxBillPropertyMapper.deletePreviewBill(record); |
|
|
|
//重新生成 |
|
|
|
wxPropertyContract.setPrice(record.getPrice()); |
|
|
|
|