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/orderdata/vo/GdDataObjectionVO.java | 124 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataObjectionVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataObjectionVO.java
index 5251651..32be65e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataObjectionVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataObjectionVO.java
@@ -16,10 +16,13 @@
*/
package org.sxkj.gd.orderdata.vo;
-import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
-import org.springblade.core.tool.node.INode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 数据异议申请表 视图实体类
@@ -28,8 +31,119 @@
* @since 2026-01-16
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdDataObjectionVO extends GdDataObjectionEntity {
+public class GdDataObjectionVO implements Serializable {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 异议标题
+ */
+ @ApiModelProperty(value = "异议标题")
+ private String title;
+ /**
+ * 异议类别（材料佐证）
+ */
+ @ApiModelProperty(value = "异议类别（材料佐证）")
+ private String objectionType;
+ /**
+ * 异议状态（草稿/待处理/已反馈）
+ */
+ @ApiModelProperty(value = "异议状态（草稿/待处理/已反馈）")
+ private String objectionStatus;
+ /**
+ * 目录/申请资源名称
+ */
+ @ApiModelProperty(value = "目录/申请资源名称")
+ private String catalogResourceName;
+ /**
+ * 问题提交人
+ */
+ @ApiModelProperty(value = "问题提交人")
+ private String submitter;
+ /**
+ * 提交人联系方式
+ */
+ @ApiModelProperty(value = "提交人联系方式")
+ private String submitterContact;
+ /**
+ * 处理单位（应急部门）
+ */
+ @ApiModelProperty(value = "处理单位（应急部门）")
+ private String handleUnit;
+ /**
+ * 异议描述
+ */
+ @ApiModelProperty(value = "异议描述")
+ private String objectionDesc;
+ /**
+ * 异议依据
+ */
+ @ApiModelProperty(value = "异议依据")
+ private String objectionBasis;
+ /**
+ * 其他异议详情
+ */
+ @ApiModelProperty(value = "其他异议详情")
+ private String otherObjectionDetail;
+ /**
+ * 审核意见
+ */
+ @ApiModelProperty(value = "审核意见")
+ private String reviewOpinion;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+ /**
+ * 附件名称列表（逗号分隔）
+ */
+ @ApiModelProperty(value = "附件名称列表（逗号分隔）")
+ private String attachNames;
+
+ @ApiModelProperty(value = "附件名称列表（逗号分隔）")
+ private String attachIds;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private String createDeptName;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
+ /**
+ * 删除标志（0存在 1删除）
+ */
+ @ApiModelProperty(value = "删除标志（0存在 1删除）")
+ private Integer isDeleted;
}
--
Gitblit v1.9.3