From 1f9f5596657af4af7e4e7da735358a0f00d64bbc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 09:17:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/vo/GdDataEvaluationVO.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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..ad34315 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,8 +16,12 @@
*/
package org.sxkj.gd.orderdata.vo;
+import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
import org.springblade.core.tool.node.INode;
+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;
@@ -32,4 +36,28 @@
public class GdDataEvaluationVO extends GdDataEvaluationEntity {
private static final long serialVersionUID = 1L;
+ @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