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/training/excel/TrainingRegistrationExcel.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java b/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
index ebfa491..dd07d06 100644
--- a/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
+++ b/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
@@ -1,5 +1,6 @@
 package org.springblade.modules.training.excel;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -7,11 +8,12 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * TrainingRegistrationExcel
  * @author zhongrj
- * @since 2021-08-12
+ * @since 2021-12-09
  */
 @Data
 @ColumnWidth(25)
@@ -20,15 +22,44 @@
 public class TrainingRegistrationExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@ColumnWidth(15)
+	@ExcelProperty("保安姓名")
+	private String realName;
+
 	@ColumnWidth(25)
-	@ExcelProperty("培训机构名称")
+	@ExcelProperty("考试名称")
+	private String trainExamName;
+
+	@ColumnWidth(25)
+	@ExcelProperty("所属企业名称")
+	@ExcelIgnore
 	private String deptName;
 
+	@ColumnWidth(25)
+	@ExcelProperty("从业单位")
+	private String unitName;
+
 	@ColumnWidth(15)
-	@ExcelProperty("姓名")
-	private String realName;
+	@ExcelProperty("准考证号")
+	private String candidateNo;
 
 	@ColumnWidth(20)
 	@ExcelProperty("身份证号")
 	private String idCardNo;
+
+	@ColumnWidth(20)
+	@ExcelProperty("报名时间")
+	private Date trainingTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("考试时间")
+	private Date trainExamTime;
+
+	@ColumnWidth(15)
+	@ExcelProperty("审核状态")
+	private String auditStatus;
+
+	@ColumnWidth(15)
+	@ExcelProperty("考试状态")
+	private String isExam;
 }

--
Gitblit v1.9.3