提交

src/main/java/cn/ezhizao/project/business/controller/BizOutsourcedOrderController.java

@@ -973,9 +973,13 @@ public class BizOutsourcedOrderController extends BaseController {
         List<BizDayworkItem> allItems = bizDayworkItemService.getListByDayworkIds(removeProcesses.isEmpty() ? Collections.singletonList(0L) : removeProcesses.stream().map(BizOutsourcedOrderDetailProcess::getDayworkId).collect(Collectors.toList()));
         List<BizDayworkItem> removeItems = allItems.stream().filter(v -> removeProcesses.stream().anyMatch(e -> e.getProcessStepNumber().equals(v.getProcessStepNumber()))).collect(Collectors.toList());
         // 还要删除对应的收回单明细
-        List<BizReturnReceiptDetail> returnReceiptDetails = bizReturnReceiptDetailService.query()
-                .in("outsource_detail_id", removeProcesses.isEmpty()? Collections.singletonList(0L): removeProcesses.stream().map(BizOutsourcedOrderDetailProcess::getDetailId).collect(Collectors.toList()))
-                .in("technological_process_detail_id", removeProcesses.isEmpty() ? Collections.singletonList(0L) : removeProcesses.stream().map(BizOutsourcedOrderDetailProcess::getTechnologicalProcessDetailId)).list();
+        List<BizReturnReceiptDetail> returnReceiptDetails = new ArrayList<>();
+        removeProcesses.forEach(l -> {
+            returnReceiptDetails.addAll( bizReturnReceiptDetailService.query()
+                    .eq("outsource_detail_id", l.getDetailId())
+                    .eq("technological_process_detail_id", l.getTechnologicalProcessDetailId()).list());
+        });
+//        List<BizReturnReceiptDetail> returnReceiptDetails = ;
         bizReturnReceiptDetailService.removeBatchByIds(returnReceiptDetails);
         bizDayworkItemService.removeBatchByIds(removeItems);
     }