From 17c0ce8a4db799aabf9ea1e12b284e24188efc3b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 15:30:10 +0800
Subject: [PATCH] 工单状态优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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..05987f2 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", "响应中_申请修改", "申请修改"),
/**
* 响应中_已取消
@@ -77,12 +77,12 @@
/**
* 响应中_拒绝取消
*/
- RESPONDING_REJECT_CANCEL("24", "响应中_拒绝取消", "拒绝取消"),
+ // RESPONDING_REJECT_CANCEL("24", "响应中_拒绝取消", "拒绝取消"),
/**
* 响应中_拒绝修改
*/
- RESPONDING_REJECT_MODIFY("25", "响应中_拒绝修改", "拒绝修改"),
+ // RESPONDING_REJECT_MODIFY("25", "响应中_拒绝修改", "拒绝修改"),
/**
* 执行中_待全部完成
@@ -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) {
@@ -233,15 +233,18 @@
case RESPONDING_APPLY_MODIFY:
// 响应中_申请修改状态允许：7同意修改，8不同意修改
return operationType ==7 || operationType == 8 ;
- case RESPONDING_REJECT_CANCEL:
- // 响应中_拒绝取消状态允许：3申请取消
- return operationType == 3;
- case RESPONDING_REJECT_MODIFY:
- // 响应中_拒绝修改状态允许：4申请修改
- return operationType == 4;
+ // case RESPONDING_REJECT_CANCEL:
+ // // 响应中_拒绝取消状态允许：3申请取消
+ // return operationType == 3;
+ // case RESPONDING_REJECT_MODIFY:
+ // // 响应中_拒绝修改状态允许：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