点名、成绩册统一读取“行政班在籍学生 ∪ 已选课学生”，不再错误显示 0 人。

教师选课名单改为展示全部本人教学班及完整学生名单，支持 Excel 导出。调停课改用教师专用教学班接口，并在服务端限制只能操作本人教学班。
2026-07-27 08:05:42 +08:00
parent bc6ffa2ada
commit 22321abe23
9 changed files with 491 additions and 69 deletions
@@ -27,6 +27,37 @@ public sealed class CourseAdjustmentsController(
        SystemRoles.AcademicAdmin + "," +
        SystemRoles.CollegeAdmin;

+    [HttpGet("task-options")]
+    [Authorize(Roles = Applicants)]
+    public async Task<ActionResult> GetTaskOptions(
+        Guid? academicTermId,
+        CancellationToken cancellationToken)
+    {
+        var source = AccessibleTeachingTasks().AsNoTracking()
+            .Where(x => x.Status == TeachingTaskStatus.Published);
+        if (academicTermId.HasValue)
+            source = source.Where(x => x.AcademicTermId == academicTermId);
+
+        return Ok(await source
+            .OrderByDescending(x => x.AcademicTerm!.StartDate)
+            .ThenBy(x => x.Course!.Code)
+            .ThenBy(x => x.TaskNumber)
+            .Select(x => new
+            {
+                x.Id,
+                x.TaskNumber,
+                x.Name,
+                x.AcademicTermId,
+                TermName = x.AcademicTerm!.Name,
+                CourseCode = x.Course!.Code,
+                CourseName = x.Course.Name,
+                ClassNames = x.Classes
+                    .OrderBy(item => item.AdministrativeClass!.Code)
+                    .Select(item => item.AdministrativeClass!.Name)
+            })
+            .ToListAsync(cancellationToken));
+    }
+
    // ═══════════════ My adjustments ═══════════════

    [HttpGet("mine")]
@@ -399,7 +430,7 @@ public sealed class CourseAdjustmentsController(
        CourseAdjustmentRequest request,
        CancellationToken cancellationToken)
    {
-        var task = await db.TeachingTasks.AsNoTracking()
+        var task = await AccessibleTeachingTasks().AsNoTracking()
            .Include(x => x.Course)
            .FirstOrDefaultAsync(x =>
                x.Id == request.TeachingTaskId &&
@@ -438,6 +469,20 @@ public sealed class CourseAdjustmentsController(
        return null;
    }

+    private IQueryable<TeachingTask> AccessibleTeachingTasks()
+    {
+        var source = db.TeachingTasks.AsQueryable();
+        var scope = currentUserDataScope.Current;
+        if (scope.Scope == DataScope.All) return source;
+        if (scope.Scope == DataScope.College)
+            return source.Where(x =>
+                x.Course!.CollegeId == scope.RestrictedCollegeId);
+        if (scope.IsInRole(SystemRoles.Teacher))
+            return source.Where(x =>
+                x.Teachers.Any(item => item.Teacher!.UserId == scope.UserId));
+        return source.Where(_ => false);
+    }
+
    private static System.Linq.Expressions.Expression<
        Func<CourseAdjustment, object>> AdjustmentProjection() => x => new
    {