From ce78e7411a00d0c0446eb9107d0f1f57af9aabfb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 16:10:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index 59a7d75..b62b5f7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -141,7 +141,7 @@
if (currentStatus == null || !currentStatus.isAllowedTransition(auditStatus)) {
throw new RuntimeException("当前任务状态无法进行该操作");
}
- // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝、8.执行完成
+ // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
// 3. 确定新状态和流转名称
PatrolTaskStatusEnum newStatusEnum;
switch (auditStatus) {
@@ -166,9 +166,6 @@
case 7: // 验收拒绝
newStatusEnum = PatrolTaskStatusEnum.REJECTED_ACCEPTANCE;
break;
- case 8: // 执行完成
- newStatusEnum = PatrolTaskStatusEnum.PENDING_ACCEPTANCE;
- break;
default: // 无效操作类型
return false;
}
--
Gitblit v1.9.3