|
@@ -714,7 +714,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
List<ClaimContract> claimContractList = claimContractService.list(Wrappers.<ClaimContract>query().lambda().in(ClaimContract::getContractId, contractIds));
|
|
|
Map<Long, List<ClaimContract>> claimMap = claimContractList.stream().collect(Collectors.groupingBy(ClaimContract::getContractId));
|
|
|
//通过合同ID查询到采购合同
|
|
|
- List<EhsdPurchase> purchaseList = ehsdPurchaseService.list(Wrappers.<EhsdPurchase>query().lambda().in(EhsdPurchase::getDataResourceId, contractIds));
|
|
|
+ List<EhsdPurchase> purchaseList = ehsdPurchaseService.list(Wrappers.<EhsdPurchase>query().lambda()
|
|
|
+ .in(EhsdPurchase::getDataResourceId, contractIds)
|
|
|
+ .in(EhsdPurchase::getStatus, FlowStatusEnum1.UNDER_REVIEW.getKey(), FlowStatusEnum1.PASS.getKey())
|
|
|
+ );
|
|
|
Map<Long, List<EhsdPurchase>> purchaseMap = purchaseList.stream().collect(Collectors.groupingBy(EhsdPurchase::getDataResourceId));
|
|
|
for (ContractBudgetVo v : list) {
|
|
|
v.setOtherIncomeAmount(BigDecimal.ZERO);//暂时先设置其他收入为0
|