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/exam/excel/ExportExamScoreExcel.java | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java b/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java
index 148a7ba..34dd62f 100644
--- a/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java
+++ b/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java
@@ -1,19 +1,3 @@
-/*
- * 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.exam.excel;
import com.alibaba.excel.annotation.ExcelIgnore;
@@ -22,6 +6,9 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
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;
@@ -76,13 +63,69 @@
@ColumnWidth(15)
@ExcelProperty("实操成绩")
- private Integer learnGrade;
+ private String learnGrade;
@ColumnWidth(15)
- @ExcelProperty("总成绩")
- private Integer allGrade;
+ @ExcelProperty("是否合格")
+ private String qualified;
@ColumnWidth(20)
@ExcelProperty("保安员证编号")
private String securityNumber;
+
+ /**
+ * 婚姻状态
+ */
+ @ExcelProperty(value = "婚姻状态*(未婚/已婚/离异/丧偶)",converter = ExcelDictConverter.class)
+ @ExcelDictItem(type = "marriageStatusType")
+ private String marriageStatus;
+ /**
+ * 报考等级
+ */
+ @ExcelProperty(value = "报考等级(初级/中级/高级/特级)",converter = ExcelDictConverter.class)
+ @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