From f1dddf7e850f9f91c7754b15b858f2ba6890fd48 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 13 Oct 2025 09:50:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=B8=8D=E5=8D=A1=E6=8E=A7=E6=89=A7=E8=A1=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java  | 3 ---
 .../nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java   | 3 ---
 .../java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java  | 3 ---
 .../nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java   | 3 ---
 .../org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java     | 3 ---
 .../nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java    | 3 ---
 .../nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java    | 3 ---
 .../org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java  | 3 ---
 .../org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java    | 3 ---
 .../org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java     | 3 ---
 .../java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java  | 3 ---
 11 files changed, 33 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
index fb02af359..0b5bdcc31 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
@@ -167,9 +167,6 @@ public class DjqTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java
index 5985f89fc..bcf3cf1b3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java
@@ -130,9 +130,6 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
index 41a3e81e0..3d20d80e8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
@@ -115,9 +115,6 @@ public class GzqTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java
index 160cfca9e..ce07874a1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java
@@ -131,9 +131,6 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
index 0cab4e148..9fc8e2c1e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
@@ -168,9 +168,6 @@ public class MzhcwTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java
index f53200c80..db3f9ab13 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java
@@ -107,9 +107,6 @@ public class SendDjqKzjTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java
index 7d1dc9601..74d70dc04 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java
@@ -105,9 +105,6 @@ public class SendGzqKzjTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
index 7fbba725d..94287d084 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java
@@ -104,9 +104,6 @@ public class ShiftingTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
index 5eb163a79..debcbce77 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
@@ -133,9 +133,6 @@ public class SsxDjwTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
index 3248d93a7..529e09628 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
@@ -155,9 +155,6 @@ public class ZxDjwTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
index 5681d5c4f..42d6b86c1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
@@ -145,9 +145,6 @@ public class ZxqTask extends AbstractAcsTask {
         }
         // 取消
         if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
-            if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatusEnum.ISSUE.getCode())) {
-                throw new BadRequestException("任务已执行不能取消");
-            }
             //任务被标记为取消
             updateWrapper.set(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("是"));
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.CANCEL.getCode());