From 3680fe7b49308a49a6d78a434eab588a755b52fa Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 13 Jan 2025 14:44:15 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=88=86=E5=88=87=E6=9A=82=E5=AD=98?= =?UTF-8?q?=E9=80=81=E6=96=99=E5=A4=9A=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/service/impl/SlitterServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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; }