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/dto/GdDataObjectionDTO.java |   80 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdDataObjectionDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdDataObjectionDTO.java
index abd121b..f51ecc9 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdDataObjectionDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/dto/GdDataObjectionDTO.java
@@ -16,9 +16,16 @@
  */
 package org.sxkj.gd.orderdata.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.sxkj.gd.orderdata.param.GdDataObjectionAttachmentParam;
+
+import java.util.List;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * 数据异议申请表 数据传输对象实体类
@@ -27,8 +34,77 @@
  * @since 2026-01-16
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class GdDataObjectionDTO extends GdDataObjectionEntity {
+public class GdDataObjectionDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "主键")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long id;
+
+	/**
+	 * 异议标题
+	 */
+	@ApiModelProperty(value = "异议标题")
+	private String title;
+	/**
+	 * 异议类别（如“材料佐证&quot;）
+	 */
+	@ApiModelProperty(value = "异议类别（如“材料佐证&quot;）")
+	private String objectionType;
+	/**
+	 * 异议状态（草稿/待处理/已反馈）
+	 */
+	@ApiModelProperty(value = "异议状态（草稿/待处理/已反馈）")
+	private String objectionStatus;
+	/**
+	 * 目录/申请资源名称
+	 */
+	@ApiModelProperty(value = "目录/申请资源名称")
+	private String catalogResourceName;
+	/**
+	 * 问题提交人
+	 */
+	@ApiModelProperty(value = "问题提交人")
+	private String submitter;
+	/**
+	 * 提交人联系方式
+	 */
+	@ApiModelProperty(value = "提交人联系方式")
+	private String submitterContact;
+	/**
+	 * 处理单位（如“应急部门&quot;）
+	 */
+	@ApiModelProperty(value = "处理单位（如“应急部门&quot;）")
+	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 = "申请目标部门ID")
+	private Long applyTargetDeptId;
+
+	@ApiModelProperty(value = "附件")
+	private List<GdDataObjectionAttachmentDTO> attachmentList;
 }

--
Gitblit v1.9.3