Commit 11eb2ec7 authored by EDY's avatar EDY

bug

parent 9f42d2b8
......@@ -9,14 +9,14 @@ import java.math.BigDecimal;
public class ContractCollectVo {
// 合同总额
private BigDecimal contractAmount;
private BigDecimal contractAmount = BigDecimal.ZERO;
// 到账金额
private BigDecimal toTheAmount;
private BigDecimal toTheAmount = BigDecimal.ZERO;
// 待收款金额
private BigDecimal payeeAmount;
private BigDecimal payeeAmount = BigDecimal.ZERO;
// 开票金额
private BigDecimal makeInvoiceAmount;
private BigDecimal makeInvoiceAmount = BigDecimal.ZERO;
}
......@@ -152,7 +152,7 @@ public class BaseContractInfoServiceImpl implements IBaseContractInfoService {
@Override
public ContractCollectVo getCollect() {
ContractCollectVo contractCollectVo = baseContractInfoMapper.queryContractAmount();
if (contractCollectVo.getContractAmount() != null && contractCollectVo.getToTheAmount() != null) {
if (contractCollectVo != null && contractCollectVo.getContractAmount() != null && contractCollectVo.getToTheAmount() != null) {
contractCollectVo.setPayeeAmount(contractCollectVo.getContractAmount().subtract(contractCollectVo.getToTheAmount()));
}
BigDecimal invoiceAmount = baseInvoiceInfoMapper.queryInvoiceAmount();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment