|
|
|
@@ -250,36 +250,41 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//对比上一次,是否有更改,有,重新生成预账单 |
|
|
|
WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(record.getId()); |
|
|
|
boolean change = false; |
|
|
|
if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null) { |
|
|
|
if (record.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) { |
|
|
|
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) |
|
|
|
|| !record.getLease().equals(dbRent.getLease()) |
|
|
|
|| !record.getType().equals(dbRent.getType()) |
|
|
|
|| !record.getPrice().equals(dbRent.getPrice()) |
|
|
|
|| !record.getAdjustRatio().replaceAll("\\s*","").equals(dbRent.getAdjustRatio().replaceAll("\\s*","")) |
|
|
|
) { |
|
|
|
change = true; |
|
|
|
} |
|
|
|
} else if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { |
|
|
|
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) |
|
|
|
|| !record.getLease().equals(dbRent.getLease()) |
|
|
|
|| !record.getType().equals(dbRent.getType()) |
|
|
|
|| !record.getRevenue().equals(dbRent.getRevenue()) |
|
|
|
|| !record.getPayRatio().equals(dbRent.getPayRatio()) |
|
|
|
) { |
|
|
|
change = true; |
|
|
|
} |
|
|
|
} else if (record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) { |
|
|
|
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) |
|
|
|
|| !record.getLease().equals(dbRent.getLease()) |
|
|
|
|| !record.getType().equals(dbRent.getType()) |
|
|
|
|| !record.getPrice().equals(dbRent.getPrice()) |
|
|
|
|| !record.getPayRatio().equals(dbRent.getPayRatio()) |
|
|
|
) { |
|
|
|
change = true; |
|
|
|
if(record.getAdjustPeriod().intValue() != dbRent.getAdjustPeriod().intValue()){ |
|
|
|
change = true; |
|
|
|
}else{ |
|
|
|
if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null) { |
|
|
|
if (record.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) { |
|
|
|
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) |
|
|
|
|| !record.getLease().equals(dbRent.getLease()) |
|
|
|
|| !record.getType().equals(dbRent.getType()) |
|
|
|
|| !record.getPrice().equals(dbRent.getPrice()) |
|
|
|
|| !record.getAdjustRatio().replaceAll("\\s*","").equals(dbRent.getAdjustRatio().replaceAll("\\s*","")) |
|
|
|
) { |
|
|
|
change = true; |
|
|
|
} |
|
|
|
} else if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { |
|
|
|
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) |
|
|
|
|| !record.getLease().equals(dbRent.getLease()) |
|
|
|
|| !record.getType().equals(dbRent.getType()) |
|
|
|
|| !record.getRevenue().equals(dbRent.getRevenue()) |
|
|
|
|| !record.getPayRatio().equals(dbRent.getPayRatio()) |
|
|
|
) { |
|
|
|
change = true; |
|
|
|
} |
|
|
|
} else if (record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) { |
|
|
|
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) |
|
|
|
|| !record.getLease().equals(dbRent.getLease()) |
|
|
|
|| !record.getType().equals(dbRent.getType()) |
|
|
|
|| !record.getPrice().equals(dbRent.getPrice()) |
|
|
|
|| !record.getPayRatio().equals(dbRent.getPayRatio()) |
|
|
|
) { |
|
|
|
change = true; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 更新 |
|
|
|
ResultData resultData = getResultDataForUpdate(record, userId); |
|
|
|
|
|
|
|
|