|
|
@@ -455,7 +455,10 @@ public class BizReturnTurnoverController extends BaseController {
|
|
|
List<BizDayworkCarrier> allDayworkCarriers = bizDayworkCarrierService.query().in("carrier_id", returnDayworkCarrierList.isEmpty() ? Collections.singletonList(0L): returnDayworkCarrierList.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).eq("is_changed", 0).list();
|
|
|
|
|
|
List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", allDayworkCarriers.isEmpty() ? Collections.singletonList(0L) : allDayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
|
|
|
- List<BizReturnReceiptDetail> bizReturnReceiptDetails = bizReturnReceiptDetailService.query().in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();
|
|
|
+ List<BizReturnReceiptDetail> bizReturnReceiptDetails = bizReturnReceiptDetailService.query()
|
|
|
+ .in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList()))
|
|
|
+ .in("outsource_detail_id",batches.isEmpty() ? Collections.singletonList(0L) : batches.stream().map(BizOutsourcedOrderDetail::getId).collect(Collectors.toList()))
|
|
|
+ .list();
|
|
|
// 获取所有明细
|
|
|
List<BizOutsourcedOrderDetail> returnBatchs = bizOutsourcedOrderDetailService.query().in("id", bizReturnReceiptDetails.stream().map(BizReturnReceiptDetail::getOutsourceDetailId).collect(Collectors.toList())).list();
|
|
|
List<BizOutsourcedOrderDetailProcess> bizOutsourcedOrderDetailProcesses = bizOutsourcedOrderDetailProcessService.query().in("detail_id", returnBatchs.isEmpty()? Collections.singletonList(0L): returnBatchs.stream().map(BizOutsourcedOrderDetail::getId).collect(Collectors.toList())).list();
|
