From 4f4872af1eef1c14d95f04bffe2a4f2d2f7d835d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 16:33:43 +0800
Subject: [PATCH] 巡查任务优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java | 11 +++++------
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java | 24 +++++++++++++++---------
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 4 ++--
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
index a972bbc..a9b8c97 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdPatrolTaskEntity.java
@@ -44,12 +44,6 @@
private Long workOrderId;
/**
- * 外部来源航线Id
- */
- @ApiModelProperty(value = "外部来源航线Id")
- private String airlineld;
-
- /**
* 巡查任务编号
*/
@ApiModelProperty(value = "巡查任务编号")
@@ -70,6 +64,11 @@
@ApiModelProperty(value = "执行时间")
private Date executeTime;
/**
+ * 外部来源航线Id
+ */
+ @ApiModelProperty(value = "外部来源航线Id")
+ private String airlineId;
+ /**
* 巡查任务航线URL
*/
@ApiModelProperty(value = "巡查任务航线URL")
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..45626d8 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
@@ -19,47 +19,47 @@
/**
* 待签收
*/
- 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 +74,12 @@
private final String desc;
/**
+ * 工单阶段描述
+ */
+ @JsonValue
+ private final String stageDesc;
+
+ /**
* 根据值获取对应的枚举
*
* @param value 枚举值
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 b55d756..0946714 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
@@ -125,7 +125,7 @@
GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
- gdWorkOrderFlowEntity.setFlowName("任务发布");
+ gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
@@ -416,7 +416,7 @@
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrderId);
- flowEntity.setFlowName(newStatus.getDesc());
+ flowEntity.setFlowName(newStatus.getStageDesc());
// 构建流转描述
String flowDesc = buildFlowDesc(newStatus, rejectReason);
--
Gitblit v1.9.3