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/vo/GdWorkOrderVO.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java
index 2cc907d..ec637ae 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java
@@ -16,9 +16,13 @@
*/
package org.sxkj.gd.workorder.vo;
-import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 工单任务表 视图实体类
@@ -27,8 +31,106 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdWorkOrderVO extends GdWorkOrderEntity {
- private static final long serialVersionUID = 1L;
+public class GdWorkOrderVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 工单名称
+ */
+ @ApiModelProperty(value = "工单名称")
+ private String workOrderName;
+ /**
+ * 工单编号（唯一）
+ */
+ @ApiModelProperty(value = "工单编号（唯一）")
+ private String workOrderCode;
+ /**
+ * 工单类型（巡查类/安检类等）
+ */
+ @ApiModelProperty(value = "工单类型（二维数组，如：[[\"road\",\"road1\"],[\"bridge\",\"bridge2\"]]）")
+ private List<List<String>> workOrderType;
+ /**
+ * 工单类型拼音首字母（用于排序，如：B、L、Z）
+ */
+ @ApiModelProperty(value = "工单类型拼音首字母（用于排序，如：B、L、Z）")
+ private String typePinyinFirst;
+ /**
+ * 设备负载需求（红外、喊话器、探照灯）
+ */
+ @ApiModelProperty(value = "设备负载需求（红外、喊话器、探照灯）")
+ private String deviceLoadDemand;
+ /**
+ * 推荐设备ID（逗号分隔）
+ */
+ @ApiModelProperty(value = "推荐设备ID（逗号分隔）")
+ private String recommendDeviceIds;
+ /**
+ * 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算
+ */
+ @ApiModelProperty(value = "工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、24响应中_拒绝取消、25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算")
+ private String workOrderStatus;
+ /**
+ * 执行时间范围-开始
+ */
+ @ApiModelProperty(value = "执行时间范围-开始")
+ private Date executeStartTime;
+ /**
+ * 执行时间范围-结束
+ */
+ @ApiModelProperty(value = "执行时间范围-结束")
+ private Date executeEndTime;
+ /**
+ * 服务方（审核人）
+ */
+ @ApiModelProperty(value = "服务方（审核人）")
+ private String serviceParty;
+ /**
+ * 经纬度面（存储地理面数据）
+ */
+ @ApiModelProperty(value = "经纬度面（存储地理面数据）")
+ private String geom;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ /**
+ * 拒绝原因（审核拒绝时必填）
+ */
+ @ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+ private String rejectReason;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ @ApiModelProperty(value = "需求方名称")
+ private String createUserName;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "逻辑删除")
+ private Integer isDeleted;
}
--
Gitblit v1.9.3