From 04ca758eb14fa39e50aea551ad646980d5e604f8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 27 Jan 2026 11:19:00 +0800
Subject: [PATCH] 导出优化

---
 drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptExcel.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptExcel.java b/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptExcel.java
index 1fed801..5d193a3 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptExcel.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptExcel.java
@@ -21,6 +21,9 @@
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
+import org.sxkj.system.util.excel.ExcelDictConverter;
+import org.sxkj.system.util.excel.ExcelDictItem;
+import org.sxkj.system.util.excel.ExcelDictItemLabel;
 
 import java.io.Serializable;
 
@@ -51,9 +54,11 @@
 
 	@ExcelProperty("机构描述")
 	@ColumnWidth(20)
-	private String deptDesc;
+	private String remark;
 
-	@ExcelProperty("机构状态")
 	@ColumnWidth(20)
-	private String deptStatus;
+	@ExcelProperty(value = "机构状态", converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "institutionStatus")
+	@ExcelDictItem(type = "institutionStatus")
+	private String status;
 }

--
Gitblit v1.9.3