This commit is contained in:
biss committed 2026-09-07 19:34:03 +08:00
1 parent cec56564b5
commit ae075bda6d
32 files changed
+10052 -90

No files matched your search

@@ -290,6 +290,11 @@ public sealed class PersonnelExcelController(
created++;
}
else updated++;
if (entity.IsArchived)
{
errors.Add($"第 {row.RowNumber} 行:记录已归档,请先恢复后再导入更新。");
continue;
}
entity.Name = name;
entity.Gender = gender.Value;
entity.CollegeId = college.Id;
@@ -362,6 +367,11 @@ public sealed class PersonnelExcelController(
created++;
}
else updated++;
if (entity.IsArchived)
{
errors.Add($"第 {row.RowNumber} 行:记录已归档,请先恢复后再导入更新。");
continue;
}
entity.Name = name;
entity.Gender = gender.Value;
entity.AdministrativeClassId = targetClass.Id;
@@ -397,6 +407,7 @@ public sealed class PersonnelExcelController(
IQueryable<Teacher> source,
PersonnelQuery query)
{
if (query.IsArchived.HasValue) source = source.Where(x => x.IsArchived == query.IsArchived.Value);
if (query.CollegeId.HasValue)
source = source.Where(x => x.CollegeId == query.CollegeId);
if (query.TeacherStatus.HasValue)
@@ -415,6 +426,7 @@ public sealed class PersonnelExcelController(
IQueryable<Student> source,
PersonnelQuery query)
{
if (query.IsArchived.HasValue) source = source.Where(x => x.IsArchived == query.IsArchived.Value);
if (query.CollegeId.HasValue)
source = source.Where(x =>
x.AdministrativeClass!.Major!.CollegeId == query.CollegeId);