|
@@ -790,11 +790,8 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
|
|
public boolean checkWorkOrderStatusProcess(List<BizArchiveInputDetailProcess> delProcess) {
|
|
public boolean checkWorkOrderStatusProcess(List<BizArchiveInputDetailProcess> delProcess) {
|
|
// 判断是否任务已完成
|
|
// 判断是否任务已完成
|
|
List<BizWorkOrder> workOrders = workOrderService.query().in("contract_detail_process_id", delProcess.stream().map(BizArchiveInputDetailProcess::getId).collect(Collectors.toList())).list();
|
|
List<BizWorkOrder> workOrders = workOrderService.query().in("contract_detail_process_id", delProcess.stream().map(BizArchiveInputDetailProcess::getId).collect(Collectors.toList())).list();
|
|
- if (workOrderRecordService.query().in("work_order_id", workOrders.stream().map(BizWorkOrder::getId).collect(Collectors.toList())).count() > 0) {
|
|
|
|
- // 存在已经在做的任务不能未完成
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
- return true;
|
|
|
|
|
|
+ // 存在已经在做的任务不能未完成
|
|
|
|
+ return workOrders.isEmpty() || workOrderRecordService.query().in("work_order_id", workOrders.stream().map(BizWorkOrder::getId).collect(Collectors.toList())).count() <= 0;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|