2.3.0-rc2
This commit is contained in:
@@ -31,6 +31,9 @@ public sealed class PersonnelExcelController(
|
||||
SystemRoles.AcademicAdmin + "," +
|
||||
SystemRoles.CollegeAdmin;
|
||||
|
||||
private const string ExportRoles =
|
||||
WriteRoles + "," + SystemRoles.Counselor;
|
||||
|
||||
private static readonly string[] TeacherHeaders =
|
||||
[
|
||||
"工号", "姓名", "性别", "学院编码", "职称", "任职状态",
|
||||
@@ -40,7 +43,10 @@ public sealed class PersonnelExcelController(
|
||||
private static readonly string[] StudentHeaders =
|
||||
[
|
||||
"学号", "姓名", "性别", "行政班编码", "入学年级", "入学日期",
|
||||
"学籍状态", "出生日期", "联系电话", "电子邮箱", "备注"
|
||||
"学籍状态", "出生日期", "英文姓名", "证件号码", "国籍", "民族",
|
||||
"政治面貌", "籍贯", "户籍地址", "现居住地址", "邮政编码",
|
||||
"联系电话", "电子邮箱", "QQ", "微信", "紧急联系人", "与本人关系",
|
||||
"紧急联系电话", "特殊标记", "特殊情况说明", "个人简介", "备注"
|
||||
];
|
||||
|
||||
[HttpGet("{kind}/template")]
|
||||
@@ -66,6 +72,7 @@ public sealed class PersonnelExcelController(
|
||||
}
|
||||
|
||||
[HttpGet("{kind}/export")]
|
||||
[Authorize(Roles = ExportRoles)]
|
||||
public async Task<IActionResult> Export(
|
||||
string kind,
|
||||
[FromQuery] PersonnelQuery query,
|
||||
@@ -96,7 +103,12 @@ public sealed class PersonnelExcelController(
|
||||
.Select(x => Row(
|
||||
x.StudentNumber, x.Name, GenderName(x.Gender),
|
||||
x.AdministrativeClass!.Code, x.EnrollmentYear, x.EnrollmentDate,
|
||||
StudentStatusName(x.Status), x.DateOfBirth, x.Phone, x.Email, x.Notes))
|
||||
StudentStatusName(x.Status), x.DateOfBirth, x.EnglishName,
|
||||
x.IdCardNumber, x.Nationality, x.Ethnicity, x.PoliticalStatus,
|
||||
x.NativePlace, x.HouseholdAddress, x.CurrentAddress, x.PostalCode,
|
||||
x.Phone, x.Email, x.Qq, x.WeChat, x.EmergencyContactName,
|
||||
x.EmergencyContactRelationship, x.EmergencyContactPhone,
|
||||
x.SpecialTags, x.SpecialNeeds, x.Biography, x.Notes))
|
||||
.ToList();
|
||||
}
|
||||
|
||||
@@ -296,8 +308,25 @@ public sealed class PersonnelExcelController(
|
||||
entity.EnrollmentDate = enrollmentDate.Value;
|
||||
entity.Status = status.Value;
|
||||
entity.DateOfBirth = dateOfBirth;
|
||||
entity.EnglishName = Optional(row, "英文姓名");
|
||||
entity.IdCardNumber = Optional(row, "证件号码");
|
||||
entity.Nationality = Optional(row, "国籍");
|
||||
entity.Ethnicity = Optional(row, "民族");
|
||||
entity.PoliticalStatus = Optional(row, "政治面貌");
|
||||
entity.NativePlace = Optional(row, "籍贯");
|
||||
entity.HouseholdAddress = Optional(row, "户籍地址");
|
||||
entity.CurrentAddress = Optional(row, "现居住地址");
|
||||
entity.PostalCode = Optional(row, "邮政编码");
|
||||
entity.Phone = Optional(row, "联系电话");
|
||||
entity.Email = Optional(row, "电子邮箱");
|
||||
entity.Qq = Optional(row, "QQ");
|
||||
entity.WeChat = Optional(row, "微信");
|
||||
entity.EmergencyContactName = Optional(row, "紧急联系人");
|
||||
entity.EmergencyContactRelationship = Optional(row, "与本人关系");
|
||||
entity.EmergencyContactPhone = Optional(row, "紧急联系电话");
|
||||
entity.SpecialTags = Optional(row, "特殊标记");
|
||||
entity.SpecialNeeds = Optional(row, "特殊情况说明");
|
||||
entity.Biography = Optional(row, "个人简介");
|
||||
entity.Notes = Optional(row, "备注");
|
||||
}
|
||||
return new(created, updated, rows.Count);
|
||||
|
||||
Reference in New Issue
Block a user