From bed0d07586e148a43a03dcfa233bfe443dcb78b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 01 Dec 2023 18:04:40 +0800
Subject: [PATCH] 考试成绩导出修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 8 +++-
src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java | 57 ++++++++++++++++++++--------
2 files changed, 47 insertions(+), 18 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 e12b869..b6c4834 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;
@@ -89,4 +76,42 @@
@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;
}
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index 89034eb..235889e 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -378,10 +378,14 @@
case when es.qualified=0 then '合格'
when es.qualified=1 then '不合格'
when es.qualified=2 then '暂未录入实操成绩'
- end as qualified
+ end as qualified,
+ bud.marriage_status marriageStatus,bud.sign_level signLevel,
+ bud.permanent_residence_address permanentResidenceAddress,bud.dwell_address dwellAddress,
+ bud.member_of_family memberOfFamily,bud.work_experience workExperience,bud.education_experience educationExperience
from exam_score es
left join ksxt_exam ke on ke.id = es.exam_id
- left join blade_user bu on es.user_id = bu.id
+ left join blade_user bu on es.user_id = bu.id and bu.is_deleted = 0
+ left join blade_user_detail bud on bud.user_id = bu.id and bud.is_deleted = 0
left join blade_dept bd on bd.id = bu.dept_id
left join sys_training_registration str on str.id = es.apply_id
left join sys_information si on si.departmentid = bd.id
--
Gitblit v1.9.3