From 92dc5972adbd94d47c0e6501ce4a7b51af09e3c3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jun 2026 22:37:57 +0800
Subject: [PATCH] refactor(workorder): 重构工单状态聚合逻辑-只处理撤回任务状态
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
index ab45986..31c3e2b 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
@@ -16,48 +16,57 @@
/**
* 待签收
+ * 对应主任务状态：发布中_接单中(10)
*/
- PENDING_SIGNING("0", "待签收","巡检任务拆分"),
+ PENDING_SIGNING("0", "待签收", "巡检任务拆分", 0, false, WorkOrderStatusEnum.PUBLISHING_ACCEPTING),
/**
- * 拒绝签收
+ * 拒绝签收（忽略）
+ * 该状态不计入主任务状态计算
*/
- REJECTED_SIGNING("1", "拒绝签收","拒绝签收"),
+ REJECTED_SIGNING("1", "拒绝签收", "拒绝签收", 1, true, null),
/**
- * 已撤回
+ * 已撤回（忽略）
+ * 该状态不计入主任务状态计算
*/
- WITHDRAWN("2", "已撤回","任务撤回"),
+ WITHDRAWN("2", "已撤回", "任务撤回", 2, true, null),
/**
* 待审核
+ * 对应主任务状态：响应中_待拆分(20)
*/
- PENDING_AUDIT("3", "待审核","待签收"),
+ PENDING_AUDIT("3", "待审核", "待签收", 3, false, WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT),
/**
* 审核驳回
+ * 对应主任务状态：响应中_申请修改(22)
*/
- AUDIT_REJECTED("4", "审核驳回","审核驳回"),
+ AUDIT_REJECTED("4", "审核驳回", "审核驳回", 4, false, WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY),
/**
* 审核通过
+ * 对应主任务状态：执行中_待全部完成(30)
*/
- AUDIT_PASSED("5", "审核通过","审核通过"),
+ AUDIT_PASSED("5", "审核通过", "审核通过", 5, false, WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED),
/**
* 待验收
+ * 对应主任务状态：完成待验_待全部验收(40)
*/
- PENDING_ACCEPTANCE("6", "待验收","待验收"),
+ PENDING_ACCEPTANCE("6", "待验收", "待验收", 6, false, WorkOrderStatusEnum.COMPLETED_TO_BE_INSPECTED),
/**
- * 拒绝验收
+ * 拒绝验收（忽略）
+ * 该状态不计入主任务状态计算
*/
- REJECTED_ACCEPTANCE("7", "拒绝验收","拒绝验收"),
+ REJECTED_ACCEPTANCE("7", "拒绝验收", "拒绝验收", 7, true, null),
/**
* 验收通过
+ * 对应主任务状态：验收通过_待结算(50)
*/
- ACCEPTANCE_PASSED("8", "验收通过","验收通过");
+ ACCEPTANCE_PASSED("8", "验收通过", "验收通过", 8, false, WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
/**
* 枚举值，对应数据库存储值
@@ -77,16 +86,59 @@
@JsonValue
private final String stageDesc;
+ /**
+ * 进度权重（数字越大进度越快）
+ * 用于状态聚合时计算最小进度
+ */
+ private final int weight;
+
+ /**
+ * 是否应该忽略该状态
+ * 拒绝签收、已撤回、拒绝验收的状态应该被忽略
+ */
+ private final boolean shouldIgnore;
+
+ /**
+ * 对应的主任务状态
+ * 忽略状态对应null
+ */
+ private final WorkOrderStatusEnum workOrderStatusMapping;
+
PatrolTaskStatusEnum(String stageDesc) {
this.value = "";
this.desc = "";
this.stageDesc = stageDesc;
+ this.weight = 0;
+ this.shouldIgnore = false;
+ this.workOrderStatusMapping = null;
}
PatrolTaskStatusEnum(String value, String desc, String stageDesc) {
this.value = value;
this.desc = desc;
this.stageDesc = stageDesc;
+ this.weight = 0;
+ this.shouldIgnore = false;
+ this.workOrderStatusMapping = null;
+ }
+
+ /**
+ * 完整构造函数
+ *
+ * @param value 枚举值，对应数据库存储值
+ * @param desc 枚举描述，用于展示
+ * @param stageDesc 工单阶段描述
+ * @param weight 进度权重（数字越大进度越快）
+ * @param shouldIgnore 是否应该忽略该状态
+ * @param workOrderStatusMapping 对应的主任务状态
+ */
+ PatrolTaskStatusEnum(String value, String desc, String stageDesc, int weight, boolean shouldIgnore, WorkOrderStatusEnum workOrderStatusMapping) {
+ this.value = value;
+ this.desc = desc;
+ this.stageDesc = stageDesc;
+ this.weight = weight;
+ this.shouldIgnore = shouldIgnore;
+ this.workOrderStatusMapping = workOrderStatusMapping;
}
/**
--
Gitblit v1.9.3