|
@@ -179,6 +179,14 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements PaySe
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ //赋值已付款金额
|
|
|
+ Map<Long, List<PayDetail>> payDetailMap = payDetailService.mapKGroup(PayDetail::getPurchaseId, q -> q.in(PayDetail::getPurchaseId, purchaseIdList));
|
|
|
+ for (PayDetailVo payDetail : payDetailVoList) {
|
|
|
+ List<PayDetail> payDetail1 = payDetailMap.get(payDetail.getPurchaseId());
|
|
|
+ BigDecimal sumMoney = payDetail1.stream().map(PayDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ payDetail.setSumMoney(sumMoney);
|
|
|
+ }
|
|
|
+
|
|
|
List<InvoiceDetails> list = invoiceDetailsService.list(q -> q.in(InvoiceDetails::getPurchaseId, purchaseIdList));
|
|
|
Map<Long, BigDecimal> invoiceAmountMap = list.stream().collect(Collectors.toMap(
|
|
|
InvoiceDetails::getPurchaseId,
|
|
@@ -189,11 +197,11 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements PaySe
|
|
|
|
|
|
//赋值流程ID
|
|
|
DynamicDataSourceContextHolder.push(SourceConstant.BASE);
|
|
|
- FlowExample flowExample = flowExampleService.getOne(Wrappers.<FlowExample>query().lambda().eq(FlowExample::getBusinessId,id));
|
|
|
+ FlowExample flowExample = flowExampleService.getOne(Wrappers.<FlowExample>query().lambda().eq(FlowExample::getBusinessId, id));
|
|
|
// 赋值流程id
|
|
|
result.setFlowExampleId(flowExample.getId());
|
|
|
|
|
|
- return result;
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
@Override
|