From f7f44b007f6d75dc1b6446f083123e39d78a9806 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:17:45 +0800
Subject: [PATCH] feat(workorder): 添加任务结果中的事件名称字段
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 112 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
index 1c7cc2b..6eec063 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java
@@ -16,10 +16,16 @@
*/
package org.sxkj.gd.orderdata.vo;
-import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
-import org.springblade.core.tool.node.INode;
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.system.cache.SysCache;
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 +34,109 @@
* @since 2026-01-16
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdDataEvaluationVO extends GdDataEvaluationEntity {
+public class GdDataEvaluationVO 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 dataName;
+ /**
+ * 提出部门ID（关联部门表）
+ */
+ @ApiModelProperty(value = "提出部门ID（关联部门表）")
+ private String proposeDeptId;
+ /**
+ * 数据提供部门ID（关联部门表）
+ */
+ @ApiModelProperty(value = "数据提供部门ID（关联部门表）")
+ private String dataProvideDeptId;
+ /**
+ * 评分（如1-10分）
+ */
+ @ApiModelProperty(value = "评分（如1-10分）")
+ private Byte score;
+ /**
+ * 是否解决（0否 1是）
+ */
+ @ApiModelProperty(value = "是否解决（0否 1是）")
+ private String isResolved;
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String evaluationContent;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+ /**
+ * 创建人
+ */
+ @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;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
+ /**
+ * 删除标志（0存在 1删除）
+ */
+ @ApiModelProperty(value = "删除标志（0存在 1删除）")
+ private Integer isDeleted;
+
+ @ApiModelProperty(value = "提出部门名称")
+ public String getProposeDeptName() {
+ if (StringUtil.isBlank(getProposeDeptId())) {
+ return null;
+ }
+ Long deptId = Func.toLong(getProposeDeptId());
+ if (deptId == null || deptId <= 0) {
+ return null;
+ }
+ return SysCache.getDeptName(deptId);
+ }
+
+ @ApiModelProperty(value = "数据提供部门名称")
+ public String getDataProvideDeptName() {
+ if (StringUtil.isBlank(getDataProvideDeptId())) {
+ return null;
+ }
+ Long deptId = Func.toLong(getDataProvideDeptId());
+ if (deptId == null || deptId <= 0) {
+ return null;
+ }
+ return SysCache.getDeptName(deptId);
+ }
}
--
Gitblit v1.9.3