From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 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 f0498f6..5a98c4c 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
@@ -13,53 +13,52 @@
* @date 2026-01-19
*/
@Getter
-@AllArgsConstructor
public enum PatrolTaskStatusEnum {
/**
* 待签收
*/
- PENDING_SIGNING("0", "待签收"),
+ PENDING_SIGNING("0", "待签收","巡检任务拆分"),
/**
* 拒绝签收
*/
- REJECTED_SIGNING("1", "拒绝签收"),
+ REJECTED_SIGNING("1", "拒绝签收","拒绝签收"),
/**
* 已撤回
*/
- WITHDRAWN("2", "已撤回"),
+ WITHDRAWN("2", "已撤回","任务撤回"),
/**
* 待审核
*/
- PENDING_AUDIT("3", "待审核"),
+ PENDING_AUDIT("3", "待审核","待签收"),
/**
* 审核驳回
*/
- AUDIT_REJECTED("4", "审核驳回"),
+ AUDIT_REJECTED("4", "审核驳回","审核驳回"),
/**
* 审核通过
*/
- AUDIT_PASSED("5", "审核通过"),
+ AUDIT_PASSED("5", "审核通过","审核通过"),
/**
* 待验收
*/
- PENDING_ACCEPTANCE("6", "待验收"),
+ PENDING_ACCEPTANCE("6", "待验收","待验收"),
/**
* 拒绝验收
*/
- REJECTED_ACCEPTANCE("7", "拒绝验收"),
+ REJECTED_ACCEPTANCE("7", "拒绝验收","拒绝验收"),
/**
* 验收通过
*/
- ACCEPTANCE_PASSED("8", "验收通过");
+ ACCEPTANCE_PASSED("8", "验收通过","验收通过");
/**
* 枚举值，对应数据库存储值
@@ -74,6 +73,24 @@
private final String desc;
/**
+ * 工单阶段描述
+ */
+ @JsonValue
+ private final String stageDesc;
+
+ PatrolTaskStatusEnum(String stageDesc) {
+ this.value = "";
+ this.desc = "";
+ this.stageDesc = stageDesc;
+ }
+
+ PatrolTaskStatusEnum(String value, String desc, String stageDesc) {
+ this.value = value;
+ this.desc = desc;
+ this.stageDesc = stageDesc;
+ }
+
+ /**
* 根据值获取对应的枚举
*
* @param value 枚举值
--
Gitblit v1.9.3