From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java | 232 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 159 insertions(+), 73 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 bfed17b..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
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.AllArgsConstructor;
import lombok.Getter;
/**
@@ -13,93 +12,180 @@
* @date 2026-01-19
*/
@Getter
-@AllArgsConstructor
public enum PatrolTaskStatusEnum {
- /**
- * 待签收
- */
- PENDING_SIGNING("0", "待签收"),
+ /**
+ * 待签收
+ * 对应主任务状态：发布中_接单中(10)
+ */
+ PENDING_SIGNING("0", "待签收", "巡检任务拆分", 0, false, WorkOrderStatusEnum.PUBLISHING_ACCEPTING),
- /**
- * 拒绝签收
- */
- REJECTED_SIGNING("1", "拒绝签收"),
+ /**
+ * 拒绝签收（忽略）
+ * 该状态不计入主任务状态计算
+ */
+ REJECTED_SIGNING("1", "拒绝签收", "拒绝签收", 1, true, null),
- /**
- * 已撤回
- */
- WITHDRAWN("2", "已撤回"),
+ /**
+ * 已撤回（忽略）
+ * 该状态不计入主任务状态计算
+ */
+ WITHDRAWN("2", "已撤回", "任务撤回", 2, true, null),
- /**
- * 待审核
- */
- PENDING_AUDIT("3", "待审核"),
+ /**
+ * 待审核
+ * 对应主任务状态：响应中_待拆分(20)
+ */
+ PENDING_AUDIT("3", "待审核", "待签收", 3, false, WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT),
- /**
- * 审核驳回
- */
- AUDIT_REJECTED("4", "审核驳回"),
+ /**
+ * 审核驳回
+ * 对应主任务状态：响应中_申请修改(22)
+ */
+ AUDIT_REJECTED("4", "审核驳回", "审核驳回", 4, false, WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY),
- /**
- * 审核通过
- */
- AUDIT_PASSED("5", "审核通过"),
+ /**
+ * 审核通过
+ * 对应主任务状态：执行中_待全部完成(30)
+ */
+ AUDIT_PASSED("5", "审核通过", "审核通过", 5, false, WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED),
- /**
- * 待验收
- */
- PENDING_ACCEPTANCE("6", "待验收"),
+ /**
+ * 待验收
+ * 对应主任务状态：完成待验_待全部验收(40)
+ */
+ PENDING_ACCEPTANCE("6", "待验收", "待验收", 6, false, WorkOrderStatusEnum.COMPLETED_TO_BE_INSPECTED),
- /**
- * 拒绝验收
- */
- REJECTED_ACCEPTANCE("7", "拒绝验收"),
+ /**
+ * 拒绝验收（忽略）
+ * 该状态不计入主任务状态计算
+ */
+ REJECTED_ACCEPTANCE("7", "拒绝验收", "拒绝验收", 7, true, null),
- /**
- * 验收通过
- */
- ACCEPTANCE_PASSED("8", "验收通过");
+ /**
+ * 验收通过
+ * 对应主任务状态：验收通过_待结算(50)
+ */
+ ACCEPTANCE_PASSED("8", "验收通过", "验收通过", 8, false, WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
- /**
- * 枚举值，对应数据库存储值
- */
- @EnumValue
- private final String value;
+ /**
+ * 枚举值，对应数据库存储值
+ */
+ @EnumValue
+ private final String value;
- /**
- * 枚举描述，用于展示
- */
- @JsonValue
- private final String desc;
+ /**
+ * 枚举描述，用于展示
+ */
+ @JsonValue
+ private final String desc;
- /**
- * 根据值获取对应的枚举
- *
- * @param value 枚举值
- * @return 对应的枚举，如果未找到则返回null
- */
- public static PatrolTaskStatusEnum getByValue(String value) {
- for (PatrolTaskStatusEnum status : values()) {
- if (status.getValue().equals(value)) {
- return status;
- }
- }
- return null;
- }
+ /**
+ * 工单阶段描述
+ */
+ @JsonValue
+ private final String stageDesc;
- /**
- * 判断值是否为有效的巡查任务状态
- *
- * @param value 待验证的值
- * @return 是否有效
- */
- public static boolean isValidValue(String value) {
- return getByValue(value) != null;
- }
+ /**
+ * 进度权重（数字越大进度越快）
+ * 用于状态聚合时计算最小进度
+ */
+ 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;
+ }
+
+ /**
+ * 根据值获取对应的枚举
+ *
+ * @param value 枚举值
+ * @return 对应的枚举，如果未找到则返回null
+ */
+ public static PatrolTaskStatusEnum getByValue(String value) {
+ for (PatrolTaskStatusEnum status : values()) {
+ if (status.getValue().equals(value)) {
+ return status;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 检查当前状态是否允许转换到目标状态
+ *
+ * @param targetStatus 审核状态：1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝"
+ * @return 是否允许转换
+ */
+ public boolean isAllowedTransition(Integer targetStatus) {
+ if (targetStatus == null) {
+ return false;
+ }
+ switch (this) {
+ case PENDING_SIGNING:
+ // 待签收状态允许转换到：拒绝签收、待审核
+ return targetStatus == 1 || targetStatus == 2;
+ case PENDING_AUDIT:
+ // 待审核状态允许转换到：审核通过、审核驳回
+ return targetStatus == 3 || targetStatus == 4 || targetStatus == 5;
+ case PENDING_ACCEPTANCE:
+ // 待验收状态允许转换到：验收通过、拒绝验收
+ return targetStatus == 6 || targetStatus == 7;
+ default:
+ // 其他状态不允许转换
+ return false;
+ }
+ }
+
/**
* 检查当前状态是否允许指定的操作类型
+ *
* @param operationType 操作类型：1接单，2拒接接单，3申请取消，4申请修改，5同意取消，6不同意取消，7同意修改，8不同意修改
* @return 是否允许操作
*/
@@ -114,13 +200,13 @@
return operationType == 1 || operationType == 2;
case REJECTED_SIGNING:
// 响应中_待拆分状态允许：3申请取消，4申请修改
- return operationType == 3 || operationType == 4 ;
+ return operationType == 3 || operationType == 4;
case WITHDRAWN:
// 响应中_申请取消状态允许：5同意取消，6不同意取消
return operationType == 5 || operationType == 6;
case PENDING_AUDIT:
// 响应中_申请修改状态允许：7同意修改，8不同意修改
- return operationType ==7 || operationType == 8 ;
+ return operationType == 7 || operationType == 8;
case AUDIT_REJECTED:
// 响应中_拒绝取消状态允许：3申请取消
return operationType == 3;
--
Gitblit v1.9.3