|
@@ -549,7 +549,7 @@ public class ProjectLibManage { |
|
|
ContractVO contractVO = BeanUtil.copyProperties(contract, ContractVO.class); |
|
|
ContractVO contractVO = BeanUtil.copyProperties(contract, ContractVO.class); |
|
|
vo.setContract(contractVO); |
|
|
vo.setContract(contractVO); |
|
|
List<PaymentPlan> payments = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class) |
|
|
List<PaymentPlan> payments = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class) |
|
|
.eq(PaymentPlan::getProjectId, projectId) |
|
|
|
|
|
|
|
|
.in(PaymentPlan::getProjectId, allVersionProjectId) |
|
|
.orderByAsc(PaymentPlan::getPaymentTime)); |
|
|
.orderByAsc(PaymentPlan::getPaymentTime)); |
|
|
contractVO.setPayments(convertPayments(payments,contractVO.getTotalAmount())); |
|
|
contractVO.setPayments(convertPayments(payments,contractVO.getTotalAmount())); |
|
|
|
|
|
|
|
|