From 939a99e2b94ca9dc96cf88b1ec403fc357f50e8a Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:26 +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, 4 insertions(+), 1 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 53bcaf8..59a7d75 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.验收拒绝
+ // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝、8.执行完成
// 3. 确定新状态和流转名称
PatrolTaskStatusEnum newStatusEnum;
switch (auditStatus) {
@@ -165,6 +165,9 @@
break;
case 7: // 验收拒绝
newStatusEnum = PatrolTaskStatusEnum.REJECTED_ACCEPTANCE;
+ break;
+ case 8: // 执行完成
+ newStatusEnum = PatrolTaskStatusEnum.PENDING_ACCEPTANCE;
break;
default: // 无效操作类型
return false;
--
Gitblit v1.9.3