|
@@ -9,6 +9,7 @@ import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
import java.util.concurrent.locks.ReadWriteLock;
|
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|
|
+import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
import javax.annotation.Resource;
|
|
@@ -185,9 +186,12 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
|
|
|
// 假设已有该任务 判断是否重建任务 修改任务月数和结束月
|
|
|
if (l.getRedirect() != null && l.getRedirect()) {
|
|
|
// 重建任务将旧任务停止
|
|
|
- workOrders.forEach(v -> v.setIsStop(1));
|
|
|
+ workOrders.forEach(v -> {
|
|
|
+ v.setIsStop(1);
|
|
|
+ v.setDeleted(1);
|
|
|
+ });
|
|
|
stopWorkOrders.addAll(workOrders);
|
|
|
- workOrderDetails.forEach(v -> v.setIsStop(1));
|
|
|
+ workOrderDetails.forEach(v ->{v.setIsStop(1);v.setDeleted(1);} );
|
|
|
stopWorkOrderDetails.addAll(workOrderDetails);
|
|
|
// 新建新任务。
|
|
|
BizWorkOrder workOrder = new BizWorkOrder();
|