diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index b76358d32..8630a7b21 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -60,6 +60,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -1511,6 +1512,16 @@ public class SlitterServiceImpl implements SlitterService { if (SlitterConstant.SLITTER_NO.equals(point.getIs_used())) { data.put("status", "已禁用"); } + List list = taskService.list(new LambdaQueryWrapper() + .eq(SchBaseTask::getIs_delete, "0") + .ne(SchBaseTask::getTask_status, "07") + .and(la -> la.eq(SchBaseTask::getPoint_code1, pointCode).or() + .eq(SchBaseTask::getPoint_code2, pointCode).or() + .eq(SchBaseTask::getPoint_code3, pointCode).or() + .eq(SchBaseTask::getPoint_code4, pointCode))); + if (list.size() > 0) { + data.put("status", data.getString("status") + ", 请等待任务完成!"); + } return res; }