From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc
---
src/main/java/org/springblade/modules/system/excel/SecurityExcel.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java b/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
index c327080..d78ccbf 100644
--- a/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
@@ -4,7 +4,12 @@
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.springblade.common.excel.ExcelDictConverter;
+import org.springblade.common.excel.ExcelDictItem;
+import org.springblade.common.excel.ExcelDictItemLabel;
+
import java.io.Serializable;
/**
@@ -31,8 +36,10 @@
@ExcelProperty("联系电话*")
private String phone;
- @ExcelProperty("性别*(男/女)")
+ @ExcelProperty(value = "性别*(男/女)",converter = ExcelDictConverter.class)
@ColumnWidth(10)
+ @ExcelDictItemLabel(type = "sex")
+ @ExcelDictItem(type = "sex")
private String sex;
@ExcelProperty("身份证号*")
@@ -50,8 +57,10 @@
@ColumnWidth(20)
private String unitName;
- @ExcelProperty("最高学历*(初中及以下/高中/中技/中专/大专/本科/博士/硕士)")
+ @ExcelProperty(value = "最高学历*(初中及以下/高中/中技/中专/大专/本科/博士/硕士)",converter = ExcelDictConverter.class)
@ColumnWidth(20)
+ @ExcelDictItemLabel(type = "educationType")
+ @ExcelDictItem(type = "educationType")
private String education;
@ExcelProperty("政治面貌*")
@@ -60,6 +69,45 @@
@ExcelProperty("联系地址*")
private String address;
+ /**
+ * 婚姻状态
+ */
+ @ExcelProperty(value = "婚姻状态*(未婚/已婚/离异/丧偶)",converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "marriageStatusType")
+ @ExcelDictItem(type = "marriageStatusType")
+ private String marriageStatus;
+ /**
+ * 报考等级
+ */
+ @ExcelProperty(value = "报考等级(初级/中级/高级/特级)",converter = ExcelDictConverter.class)
+ @ExcelDictItemLabel(type = "signLevelType")
+ @ExcelDictItem(type = "signLevelType")
+ private String signLevel;
+ /**
+ * 户籍地址
+ */
+ @ExcelProperty(value = "户籍地址")
+ private String permanentResidenceAddress;
+ /**
+ * 居住地址
+ */
+ @ExcelProperty(value = "居住地址")
+ private String dwellAddress;
+ /**
+ * 家庭主要成员及联系方式
+ */
+ @ExcelProperty(value = "家庭主要成员及联系方式")
+ private String memberOfFamily;
+ /**
+ * 工作经历
+ */
+ @ExcelProperty(value = "工作经历")
+ private String workExperience;
+ /**
+ * 教育经历
+ */
+ @ExcelProperty(value = "教育经历")
+ private String educationExperience;
}
--
Gitblit v1.9.3