|
@@ -95,12 +95,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
|
|
|
//应收金额总计
|
|
|
BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
|
|
|
contracts.setPlanMoneyTotal(planMoneyTotal);
|
|
|
- //实收金额总计
|
|
|
- BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
|
|
|
- contracts.setWorkMoneyTotal(workMoneyTotal);
|
|
|
- //开票金额总计
|
|
|
- BigDecimal invoiceTotal = paymentList.stream().map(Payment::getAmountInvoice).reduce(ZERO, BigDecimal::add);
|
|
|
- contracts.setInvoiceMoneyTotal(invoiceTotal);
|
|
|
}
|
|
|
//插入合同信息
|
|
|
boolean result = save(contracts);
|
|
@@ -143,12 +137,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
|
|
|
//应收金额总计
|
|
|
BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
|
|
|
contracts.setPlanMoneyTotal(planMoneyTotal);
|
|
|
- //实收金额总计
|
|
|
- BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
|
|
|
- contracts.setWorkMoneyTotal(workMoneyTotal);
|
|
|
- //开票金额总计
|
|
|
- BigDecimal invoiceTotal = paymentList.stream().map(Payment::getAmountInvoice).reduce(ZERO, BigDecimal::add);
|
|
|
- contracts.setInvoiceMoneyTotal(invoiceTotal);
|
|
|
}
|
|
|
//插入新合同信息
|
|
|
boolean result = save(contracts);
|
|
@@ -222,12 +210,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
|
|
|
//应收金额总计
|
|
|
BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
|
|
|
contracts.setPlanMoneyTotal(planMoneyTotal);
|
|
|
- //实收金额总计
|
|
|
- BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
|
|
|
- contracts.setWorkMoneyTotal(workMoneyTotal);
|
|
|
- //开票金额总计
|
|
|
- BigDecimal invoiceTotal = paymentList.stream().map(Payment::getAmountInvoice).reduce(ZERO, BigDecimal::add);
|
|
|
- contracts.setInvoiceMoneyTotal(invoiceTotal);
|
|
|
|
|
|
boolean contractResult = updateById(contracts);
|
|
|
if (!contractResult)
|