From fdd02ce546bc7e312e469e62d3473d9517a8a961 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:22:15 +0800
Subject: [PATCH] 同步获取吉安机巢无人机设备
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
index 592e182..6c4ce21 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
@@ -67,7 +67,7 @@
/**
* 响应中_申请修改
*/
- RESPONDING_APPLY_MODIFY("22", "响应中_申请修改", "申请取消"),
+ RESPONDING_APPLY_MODIFY("22", "响应中_申请修改", "申请修改"),
/**
* 响应中_已取消
@@ -212,7 +212,7 @@
/**
* 检查当前状态是否允许指定的操作类型
- * @param operationType 操作类型：1接单，2拒接接单，3申请取消，4申请修改，5同意取消，6不同意取消，7同意修改，8不同意修改
+ * @param operationType 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改 11.结算
* @return 是否允许操作
*/
public boolean isAllowedOperation(Integer operationType) {
@@ -238,10 +238,13 @@
return operationType == 3;
case RESPONDING_REJECT_MODIFY:
// 响应中_拒绝修改状态允许：4申请修改
- return operationType == 4;
+ return operationType == 4 || operationType == 3;
case ACCEPTED_TO_BE_SETTLED:
// 验收通过_待结算状态允许：11结算完成
return operationType == 11;
+ case EXECUTING_TO_BE_COMPLETED:
+ // 执行中_待全部完成状态允许：9.协商修改
+ return operationType == 9;
default:
// 其他状态不允许操作
return false;
--
Gitblit v1.9.3