|
|
@@ -214,7 +214,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
|
|
|
- wrapper.in("t1.refundStatusNew", dto.getRefundStatusNew().split(","));
|
|
|
+ wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(dto.getKeyword())) {
|
|
|
wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
|
|
|
@@ -897,7 +897,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
List<PurchaseDetail> purchaseDetailList = purchaseDetailService.list(q -> q.in(PurchaseDetail::getPurchaseId, purchaseIdList));
|
|
|
|
|
|
// 赋值关联销售合同
|
|
|
- setContractInfo(vo, purchaseDetailList);
|
|
|
+ setContractInfo(vo, purchaseList);
|
|
|
|
|
|
// 赋值采购合同数据
|
|
|
setPurchaseInfo(vo, purchaseList, purchaseDetailList);
|
|
|
@@ -1024,11 +1024,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
/**
|
|
|
* 赋值销售合同数据
|
|
|
*/
|
|
|
- private void setContractInfo(PayDecisionAidVo vo, List<PurchaseDetail> purchaseDetailList) {
|
|
|
+ private void setContractInfo(PayDecisionAidVo vo, List<Purchase> purchaseList) {
|
|
|
|
|
|
- List<Long> contractIdList = purchaseDetailList.stream()
|
|
|
+ List<Long> contractIdList = purchaseList.stream()
|
|
|
.filter(item -> Objects.equals(item.getDataResource(), 1))
|
|
|
- .map(PurchaseDetail::getDataResourceId)
|
|
|
+ .map(Purchase::getDataResourceId)
|
|
|
.filter(Objects::nonNull)
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
caozj