From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/system/excel/SecurityExcel.java | 109 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 26 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 759626b..4c1fe68 100644
--- a/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
@@ -1,28 +1,19 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.modules.system.excel;
import com.alibaba.excel.annotation.ExcelProperty;
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 com.fasterxml.jackson.annotation.JsonFormat;
+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 org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* UserExcel
@@ -36,7 +27,7 @@
public class SecurityExcel implements Serializable {
private static final long serialVersionUID = 1L;
- @ExcelProperty("单位名称*")
+ @ExcelProperty("企业名称*")
@ColumnWidth(30)
private String deptId;
@@ -48,8 +39,10 @@
@ExcelProperty("联系电话*")
private String phone;
- @ExcelProperty("性别*")
+ @ExcelProperty(value = "性别*(男/女)",converter = ExcelDictConverter.class)
@ColumnWidth(10)
+ @ExcelDictItemLabel(type = "sex")
+ @ExcelDictItem(type = "sex")
private String sex;
@ExcelProperty("身份证号*")
@@ -60,16 +53,80 @@
@ColumnWidth(10)
private String nation;
- @ExcelProperty("身份证住址*")
- private String registered;
-
- @ExcelProperty("是否持证*")
- @ColumnWidth(15)
- private String hold;
-
- @ExcelProperty("保安员证编码")
+ @ExcelProperty("从业单位*")
@ColumnWidth(20)
+ private String unitName;
+
+ @ExcelProperty("保安员证编号")
+ @ColumnWidth(15)
private String securitynumber;
+ @ExcelProperty(value = "最高学历*(初中及以下/高中/中技/中专/大专/本科/博士/硕士)",converter = ExcelDictConverter.class)
+ @ColumnWidth(20)
+ @ExcelDictItemLabel(type = "educationType")
+ @ExcelDictItem(type = "educationType")
+ private String education;
+
+ @ExcelProperty("政治面貌*")
+ @ColumnWidth(20)
+ private String politicaloutlook;
+ /**
+ * 婚姻状态
+ */
+ @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;
+
+ /**
+ * 受理公安机关
+ */
+ @ExcelProperty(value = "受理公安机关")
+ private String acceptancePoliceUnit;
+
+ /**
+ * 受理人
+ */
+ @ExcelProperty(value = "受理人")
+ private String acceptancePerson;
+
+ /**
+ * 受理时间
+ */
+ @ExcelProperty(value = "受理时间")
+ private String acceptanceTime;
+
}
--
Gitblit v1.9.3