|
|
@ -4833,7 +4833,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); |
|
|
|
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) { |
|
|
|
all = all.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
|
voucherResultDetailDtoDf.setSummary("收款-"+finalConfirmation.getPayerName()); |
|
|
|
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
voucherResultDetailDtoDf.setSummary("收款-赎回款"); |
|
|
|
}else{ |
|
|
|
voucherResultDetailDtoDf.setSummary("收款-转租款"); |
|
|
|
} |
|
|
|
|
|
|
|
voucherResultDetailDtoDf.setSubjectNo("1201.03.01"); |
|
|
|
//核算部门
|
|
|
|
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); |
|
|
@ -4847,7 +4852,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
|
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); |
|
|
|
if ("资金占用费".equals(v.getReceivablesName())) { |
|
|
|
all = all.add(new BigDecimal(v.getSubscriptionMoney())); |
|
|
|
voucherResultDetailDtoDf2.setSummary("收款-"+finalConfirmation.getPayerName()); |
|
|
|
if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){ |
|
|
|
voucherResultDetailDtoDf2.setSummary("收款-赎回款"); |
|
|
|
}else{ |
|
|
|
voucherResultDetailDtoDf2.setSummary("收款-转租款"); |
|
|
|
} |
|
|
|
voucherResultDetailDtoDf2.setSubjectNo("1201.02.03"); |
|
|
|
//核算部门
|
|
|
|
voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode()); |
|
|
|