From a39dc5b34f8d49d6a3b40e9dd9e71faa2fac12d8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 16:03:19 +0800
Subject: [PATCH] 工单优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java | 5 ++++-
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java | 9 +++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java
index 9b5656f..4215609 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java
@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* @Description 创建设备分页查询参数类
* @Author AIX
@@ -40,4 +42,11 @@
*/
@ApiModelProperty(value = "运行状态（0:在线/1:离线/2:故障/3:报废）")
private Integer status;
+
+ /**
+ * 设备状态，多个状态用逗号隔
+ */
+ @ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
+ private List<String> deviceStatusList;
+
}
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 a4edf9d..6c4ce21 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
@@ -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) {
@@ -242,6 +242,9 @@
case ACCEPTED_TO_BE_SETTLED:
// 验收通过_待结算状态允许：11结算完成
return operationType == 11;
+ case EXECUTING_TO_BE_COMPLETED:
+ // 执行中_待全部完成状态允许：9.协商修改
+ return operationType == 9;
default:
// 其他状态不允许操作
return false;
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index e5aa178..3356754 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -32,7 +32,7 @@
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
select
pt.*,
- md.device_name,
+ md.nickname as deviceName,
wo.work_order_name,
IFNULL(tr.result_count, 0) as result_count,
IFNULL(tr.issue_event_count, 0) as issue_event_count
--
Gitblit v1.9.3