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/RegionExcel.java | 53 ++++++++++++++++-------------------------------------
1 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/excel/RegionExcel.java b/drone-service/drone-system/src/main/java/org/sxkj/system/excel/RegionExcel.java
index 11f7b49..00edcf5 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/excel/RegionExcel.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/excel/RegionExcel.java
@@ -20,7 +20,11 @@
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
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;
@@ -36,55 +40,30 @@
public class RegionExcel implements Serializable {
private static final long serialVersionUID = 1L;
+ @ColumnWidth(20)
@ExcelProperty("区划编号")
private String code;
- @ExcelProperty("父区划编号")
- private String parentCode;
-
- @ExcelProperty("祖区划编号")
- private String ancestors;
-
+ @ColumnWidth(20)
@ExcelProperty("区划名称")
private String name;
- @ExcelProperty("省级区划编号")
- private String provinceCode;
+ @ColumnWidth(20)
+ @ExcelProperty("上级区划名称")
+ private String parentName;
- @ExcelProperty("省级名称")
- private String provinceName;
-
- @ExcelProperty("市级区划编号")
- private String cityCode;
-
- @ExcelProperty("市级名称")
- private String cityName;
-
- @ExcelProperty("区级区划编号")
- private String districtCode;
-
- @ExcelProperty("区级名称")
- private String districtName;
-
- @ExcelProperty("镇级区划编号")
- private String townCode;
-
- @ExcelProperty("镇级名称")
- private String townName;
-
- @ExcelProperty("村级区划编号")
- private String villageCode;
-
- @ExcelProperty("村级名称")
- private String villageName;
-
+ @ColumnWidth(20)
@ExcelProperty("层级")
private Integer regionLevel;
+ @ColumnWidth(20)
@ExcelProperty("排序")
private Integer sort;
- @ExcelProperty("备注")
- private String remark;
+ @ColumnWidth(20)
+ @ExcelProperty(value = "机构状态", converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "institutionStatus")
+ @ExcelDictItem(type = "institutionStatus")
+ private String status;
}
--
Gitblit v1.9.3