|
|
|
@@ -1930,19 +1930,34 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = {Exception.class}) |
|
|
|
public ResultData updateFile(WxRentContract record, Long userId,String userName,Date oldRentStartDate,boolean writeComplate) { |
|
|
|
|
|
|
|
WxRentContract wxRentContract = wxRentContractMapper.selectById(record.getId()); |
|
|
|
if (null == wxRentContract) { |
|
|
|
return new ResultData(Result.ERROR,"id查询不到合同"); |
|
|
|
} |
|
|
|
// 保存调整金额(预账单调整) |
|
|
|
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ |
|
|
|
savePreviewBill(record); |
|
|
|
wxRentContract.setPreviewBillRentList(record.getPreviewBillRentList()); |
|
|
|
savePreviewBill(wxRentContract); |
|
|
|
//保存商业管理费账单 |
|
|
|
savePreviewManageFeeBill(record,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); |
|
|
|
savePreviewManageFeeBill(wxRentContract,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); |
|
|
|
//保存营业管理费账单 |
|
|
|
savePreviewManageFeeBill(record,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); |
|
|
|
savePreviewManageFeeBill(wxRentContract,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); |
|
|
|
} |
|
|
|
ResultData resultData = getResultDataForUpdate(record, userId,0,oldRentStartDate,writeComplate); |
|
|
|
// ResultData resultData = getResultDataForUpdate(record, userId,0,oldRentStartDate,writeComplate); |
|
|
|
// if (resultData.code != Result.SUCCESS) { |
|
|
|
// return resultData; |
|
|
|
// } |
|
|
|
return resultData; |
|
|
|
WxRentContract rc = new WxRentContract(); |
|
|
|
rc.setId(record.getId()); |
|
|
|
rc.setRentalStartDate(oldRentStartDate); |
|
|
|
if (writeComplate) { |
|
|
|
rc.setStatus(EnumRentContractStatus.DRAFT.getCode()); |
|
|
|
}else { |
|
|
|
rc.setStatus(wxRentContract.getStatus()); |
|
|
|
} |
|
|
|
wxRentContractMapper.updateById(rc); |
|
|
|
return new ResultData(wxRentContract); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|