自选项目实验优化

src/Jiaowu.Api/Controllers/ExperimentGradesController.cs

@@ -419,6 +419,14 @@ public sealed class ExperimentGradesController(
 
         var recordsSource = db.ExperimentGradeRecords.AsNoTracking()
             .Where(x => x.ExperimentGradeSheetId == id);
+        var scope = currentUserDataScope.Current;
+        var isBoundInstructor = scope.Scope == DataScope.Self &&
+                                scope.IsInRole(SystemRoles.Teacher) &&
+                                sheet.ArrangementMode == ExperimentArrangementMode.SelfScheduled;
+        if (isBoundInstructor)
+            recordsSource = recordsSource.Where(x =>
+                x.ExperimentSession != null && x.ExperimentSession.Instructors.Any(
+                    instructor => instructor.Teacher!.UserId == scope.UserId));
         if (studentKeyword is not null)
             recordsSource = recordsSource.Where(x =>
                 x.Student!.StudentNumber.Contains(studentKeyword) ||
@@ -512,7 +520,7 @@ public sealed class ExperimentGradesController(
                 sheet.CreatedAt,
                 sheet.UpdatedAt
             },
-            CanEdit = CanEdit(task) &&
+            CanEdit = (CanEdit(task) || isBoundInstructor) &&
                 sheet.Status is
                     ExperimentGradeSheetStatus.Draft or
                     ExperimentGradeSheetStatus.Returned,
@@ -584,13 +592,18 @@ public sealed class ExperimentGradesController(
             .Include(x => x.Items)
             .Include(x => x.Records)
             .ThenInclude(x => x.ItemScores)
+            .Include(x => x.Records)
+            .ThenInclude(x => x.ExperimentSession)
+            .ThenInclude(x => x!.Instructors)
+            .ThenInclude(x => x.Teacher)
             .Include(x => x.ExperimentProject)
             .ThenInclude(x => x!.TeachingTask)
             .ThenInclude(x => x!.Teachers)
             .ThenInclude(x => x.Teacher)
             .FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
         if (sheet is null) return NotFound();
-        if (!CanEdit(sheet.ExperimentProject!.TeachingTask!)) return Forbid();
+        if (!CanEdit(sheet.ExperimentProject!.TeachingTask!) &&
+            !CanEditBoundSessionRecords(sheet, request.Records)) return Forbid();
         if (sheet.Status is not (
                 ExperimentGradeSheetStatus.Draft or
                 ExperimentGradeSheetStatus.Returned))
@@ -1138,6 +1151,15 @@ public sealed class ExperimentGradesController(
 
     private IQueryable<ExperimentProject> ScopedProjects()
     {
+        var scope = currentUserDataScope.Current;
+        if (scope.Scope == DataScope.Self && scope.IsInRole(SystemRoles.Teacher))
+            return db.ExperimentProjects.Where(x =>
+                (x.ArrangementMode == ExperimentArrangementMode.Centralized &&
+                 x.TeachingTask!.Teachers.Any(item =>
+                     item.Teacher!.UserId == scope.UserId)) ||
+                (x.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
+                 x.Sessions.Any(session => session.Instructors.Any(instructor =>
+                     instructor.Teacher!.UserId == scope.UserId))));
         var taskIds = AccessibleTeachingTasks().Select(x => x.Id);
         return db.ExperimentProjects.Where(x =>
             taskIds.Contains(x.TeachingTaskId));
@@ -1160,6 +1182,22 @@ public sealed class ExperimentGradesController(
         currentUserDataScope.Current.IsInRole(SystemRoles.SuperAdmin) ||
         IsAssignedTeacher(task);
 
+    private bool CanEditBoundSessionRecords(
+        ExperimentGradeSheet sheet,
+        IReadOnlyCollection<ExperimentGradeRecordRequest> requestedRecords)
+    {
+        var scope = currentUserDataScope.Current;
+        if (sheet.ExperimentProject!.ArrangementMode != ExperimentArrangementMode.SelfScheduled ||
+            scope.Scope != DataScope.Self || !scope.IsInRole(SystemRoles.Teacher) ||
+            requestedRecords.Count == 0)
+            return false;
+        var requestedIds = requestedRecords.Select(x => x.Id).ToHashSet();
+        return requestedIds.All(recordId => sheet.Records.Any(record =>
+            record.Id == recordId &&
+            record.ExperimentSession?.Instructors.Any(instructor =>
+                instructor.Teacher?.UserId == scope.UserId) == true));
+    }
+
     private bool IsAssignedTeacher(TeachingTask task) =>
         task.Teachers.Any(x =>
             x.Teacher?.UserId == currentUserDataScope.Current.UserId);

src/Jiaowu.Api/Controllers/ExperimentsController.cs

@@ -87,6 +87,7 @@ public sealed class ExperimentsController(
                     x.Name,
                     x.AcademicTermId,
                     x.CourseId,
+                    x.SchedulingMode,
                     TermName = x.AcademicTerm!.Name,
                     TermStartDate = x.AcademicTerm.StartDate,
                     TermEndDate = x.AcademicTerm.EndDate,
@@ -163,6 +164,19 @@ public sealed class ExperimentsController(
                     ,x.TeachingVenueNature
                 })
                 .ToListAsync(cancellationToken),
+            Teachers = await AccessibleTeachingTasks().AsNoTracking()
+                .SelectMany(x => x.Teachers)
+                .Where(x => x.Teacher != null && x.Teacher.Status == TeacherStatus.Active)
+                .Select(x => new
+                {
+                    x.TeachingTaskId,
+                    x.TeacherId,
+                    TeacherNumber = x.Teacher!.TeacherNumber,
+                    TeacherName = x.Teacher.Name
+                })
+                .Distinct()
+                .OrderBy(x => x.TeacherNumber)
+                .ToListAsync(cancellationToken),
             Periods = periodItems
         });
     }
@@ -183,6 +197,11 @@ public sealed class ExperimentsController(
         int pageSize = 20)
     {
         var source = ScopedProjects().AsNoTracking();
+        var scope = currentUserDataScope.Current;
+        if (scope.Scope == DataScope.Self && scope.IsInRole(SystemRoles.Teacher))
+            source = source.Where(x => x.Sessions.Any(session =>
+                session.Instructors.Any(instructor =>
+                    instructor.Teacher!.UserId == scope.UserId)));
         if (academicTermId.HasValue)
             source = source.Where(x =>
                 x.TeachingTask!.AcademicTermId == academicTermId);
@@ -249,6 +268,8 @@ public sealed class ExperimentsController(
                 x.Requirements,
                 x.StartDate,
                 x.EndDate,
+                x.SelectionStartsAt,
+                x.SelectionEndsAt,
                 x.Status,
                 x.PublishedAt,
                 x.ClosedAt,
@@ -294,6 +315,14 @@ public sealed class ExperimentsController(
                         ClassroomName = item.Classroom!.Name,
                         BuildingName = item.Classroom.Building!.Name,
                         CampusName = item.Classroom.Building.Campus!.Name
+                        ,InstructorNames = item.Instructors
+                            .OrderBy(instructor => instructor.Teacher!.TeacherNumber)
+                            .Select(instructor => instructor.Teacher!.Name)
+                        ,InstructorTeacherIds = item.Instructors
+                            .Select(instructor => instructor.TeacherId)
+                        ,CanManage = scope.Scope != DataScope.Self ||
+                            item.Instructors.Any(instructor =>
+                                instructor.Teacher!.UserId == scope.UserId)
                     })
             })
             .ToListAsync(cancellationToken);
@@ -337,6 +366,8 @@ public sealed class ExperimentsController(
                 x.Requirements,
                 x.StartDate,
                 x.EndDate,
+                x.SelectionStartsAt,
+                x.SelectionEndsAt,
                 x.Status,
                 AcademicTermId = x.TeachingTask!.AcademicTermId,
                 TermName = x.TeachingTask.AcademicTerm!.Name,
@@ -376,6 +407,9 @@ public sealed class ExperimentsController(
                         ClassroomName = item.Classroom!.Name,
                         BuildingName = item.Classroom.Building!.Name,
                         CampusName = item.Classroom.Building.Campus!.Name
+                        ,InstructorNames = item.Instructors
+                            .OrderBy(instructor => instructor.Teacher!.TeacherNumber)
+                            .Select(instructor => instructor.Teacher!.Name)
                     }),
                 MyBooking = x.Bookings
                     .Where(item =>
@@ -430,7 +464,9 @@ public sealed class ExperimentsController(
             Description = Normalize(request.Description),
             Requirements = Normalize(request.Requirements),
             StartDate = request.StartDate,
-            EndDate = request.EndDate
+            EndDate = request.EndDate,
+            SelectionStartsAt = NormalizeSelectionTime(request.SelectionStartsAt),
+            SelectionEndsAt = NormalizeSelectionTime(request.SelectionEndsAt)
         };
         db.ExperimentProjects.Add(project);
         await db.SaveChangesAsync(cancellationToken);
@@ -569,7 +605,9 @@ public sealed class ExperimentsController(
                     Description = Normalize(request.Description),
                     Requirements = Normalize(request.Requirements),
                     StartDate = request.StartDate,
-                    EndDate = request.EndDate
+                    EndDate = request.EndDate,
+                    SelectionStartsAt = NormalizeSelectionTime(request.SelectionStartsAt),
+                    SelectionEndsAt = NormalizeSelectionTime(request.SelectionEndsAt)
                 });
             }
         }
@@ -645,6 +683,8 @@ public sealed class ExperimentsController(
         project.Requirements = Normalize(request.Requirements);
         project.StartDate = request.StartDate;
         project.EndDate = request.EndDate;
+        project.SelectionStartsAt = NormalizeSelectionTime(request.SelectionStartsAt);
+        project.SelectionEndsAt = NormalizeSelectionTime(request.SelectionEndsAt);
         await db.SaveChangesAsync(cancellationToken);
         return NoContent();
     }
@@ -755,6 +795,7 @@ public sealed class ExperimentsController(
     {
         var project = await ScopedProjects()
             .Include(x => x.Sessions)
+            .ThenInclude(x => x.Instructors)
             .Include(x => x.TeachingTask)
             .ThenInclude(x => x!.Course)
             .FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
@@ -774,6 +815,14 @@ public sealed class ExperimentsController(
                 (x.SessionDate < project.StartDate ||
                  x.SessionDate > project.EndDate)))
             return ConflictProblem("存在不在项目开放日期范围内的实验场次。");
+        if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
+            (project.SelectionStartsAt is null || project.SelectionEndsAt is null ||
+             project.SelectionStartsAt >= project.SelectionEndsAt))
+            return ConflictProblem("请先设置有效的开始选课和截至选课时间。");
+        if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
+            project.Sessions.Any(x => x.Status == ExperimentSessionStatus.Scheduled &&
+                                      x.Instructors.Count == 0))
+            return ConflictProblem("请为每个有效实验场次至少指定一位指导老师。");
 
         project.Status = ExperimentProjectStatus.Published;
         project.PublishedAt = DateTime.UtcNow;
@@ -872,6 +921,10 @@ public sealed class ExperimentsController(
                 cancellationToken),
             Notes = Normalize(request.Notes)
         };
+        session.Instructors = request.InstructorTeacherIds!
+            .Distinct()
+            .Select(teacherId => new ExperimentSessionInstructor { TeacherId = teacherId })
+            .ToList();
         db.ExperimentSessions.Add(session);
         await db.SaveChangesAsync(cancellationToken);
 
@@ -907,16 +960,14 @@ public sealed class ExperimentsController(
         if (request.Items.Count > 100)
             return Task.FromResult<ActionResult>(
                 ValidationProblem("单次最多安排 100 条实验场次。"));
-        if (request.Items.Any(x => x.ProjectId == Guid.Empty) ||
+        if (request.Items.Any(x => x.ProjectId == Guid.Empty))
-            request.Items.Select(x => x.ProjectId).Distinct().Count() !=
-            request.Items.Count)
             return Task.FromResult<ActionResult>(
-                ValidationProblem("同一批次中每个实验项目只能安排一个场次。"));
+                ValidationProblem("实验项目不能为空。"));
 
         return db.ExecuteInRetriableTransactionAsync<ActionResult>(
             async transaction =>
             {
-                var projectIds = request.Items.Select(x => x.ProjectId).ToList();
+                var projectIds = request.Items.Select(x => x.ProjectId).Distinct().ToList();
                 var projects = await ScopedProjects()
                     .Include(x => x.TeachingTask)
                     .ThenInclude(x => x!.AcademicTerm)
@@ -960,6 +1011,10 @@ public sealed class ExperimentsController(
                             cancellationToken),
                         Notes = Normalize(item.Notes)
                     };
+                    session.Instructors = item.InstructorTeacherIds!
+                        .Distinct()
+                        .Select(teacherId => new ExperimentSessionInstructor { TeacherId = teacherId })
+                        .ToList();
                     db.ExperimentSessions.Add(session);
                     await db.SaveChangesAsync(cancellationToken);
                     createdSessions.Add((project, session));
@@ -1003,12 +1058,11 @@ public sealed class ExperimentsController(
             .Include(x => x.ExperimentProject)
             .ThenInclude(x => x!.TeachingTask)
             .ThenInclude(x => x!.Course)
+            .Include(x => x.Instructors)
+            .ThenInclude(x => x.Teacher)
             .FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
-        if (session is null ||
+        if (session is null) return NotFound();
-            !await ScopedProjects().AnyAsync(
+        if (!CanManageSession(session)) return Forbid();
-                x => x.Id == session.ExperimentProjectId,
-                cancellationToken))
-            return NotFound();
         if (session.Status == ExperimentSessionStatus.Cancelled)
             return NoContent();
 
@@ -1070,12 +1124,11 @@ public sealed class ExperimentsController(
     {
         var session = await db.ExperimentSessions.AsNoTracking()
             .Include(x => x.ExperimentProject)
+            .Include(x => x.Instructors)
+            .ThenInclude(x => x.Teacher)
             .FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
-        if (session is null ||
+        if (session is null) return NotFound();
-            !await ScopedProjects().AnyAsync(
+        if (!CanManageSession(session)) return Forbid();
-                x => x.Id == session.ExperimentProjectId,
-                cancellationToken))
-            return NotFound();
 
         if (session.ExperimentProject!.ArrangementMode ==
             ExperimentArrangementMode.Centralized)
@@ -1138,6 +1191,12 @@ public sealed class ExperimentsController(
                 if (session.ExperimentProject.ArrangementMode !=
                     ExperimentArrangementMode.SelfScheduled)
                     return ConflictProblem("集中安排实验无需学生预约。");
+                var now = DateTime.UtcNow;
+                if (session.ExperimentProject.SelectionStartsAt is null ||
+                    session.ExperimentProject.SelectionEndsAt is null ||
+                    now < session.ExperimentProject.SelectionStartsAt ||
+                    now > session.ExperimentProject.SelectionEndsAt)
+                    return ConflictProblem("当前不在该实验项目的选课时间范围内。");
                 if (!await TeachingTaskRosterQuery
                         .TaskIdsForStudent(db, student.Id)
                         .ContainsAsync(
@@ -1243,11 +1302,34 @@ public sealed class ExperimentsController(
             IsolationLevel.Serializable);
     }
 
+    private async Task<string?> ValidateInstructorTeacherIdsAsync(
+        ExperimentProject project,
+        IReadOnlyList<Guid>? instructorTeacherIds,
+        CancellationToken cancellationToken)
+    {
+        var ids = instructorTeacherIds?.Where(x => x != Guid.Empty).Distinct().ToList() ?? [];
+        if (ids.Count == 0) return "请至少选择一位指导老师。";
+        if (ids.Count > 20) return "单个实验场次最多选择 20 位指导老师。";
+        var validCount = await db.TeachingTaskTeachers.AsNoTracking()
+            .Where(x => x.TeachingTaskId == project.TeachingTaskId &&
+                        ids.Contains(x.TeacherId) &&
+                        x.Teacher!.Status == TeacherStatus.Active)
+            .Select(x => x.TeacherId)
+            .Distinct()
+            .CountAsync(cancellationToken);
+        return validCount == ids.Count
+            ? null
+            : "指导老师必须是该教学任务的在职任课教师。";
+    }
+
     private async Task<string?> ValidateSessionAsync(
         ExperimentProject project,
         ExperimentSessionRequest request,
         CancellationToken cancellationToken)
     {
+        var instructorProblem = await ValidateInstructorTeacherIdsAsync(
+            project, request.InstructorTeacherIds, cancellationToken);
+        if (instructorProblem is not null) return instructorProblem;
         if (request.SessionDate < project.StartDate ||
             request.SessionDate > project.EndDate)
             return "实验场次日期必须在项目开放日期范围内。";
@@ -1475,6 +1557,16 @@ public sealed class ExperimentsController(
             taskIds.Contains(x.TeachingTaskId));
     }
 
+    private bool CanManageSession(ExperimentSession session)
+    {
+        var scope = currentUserDataScope.Current;
+        if (scope.Scope is DataScope.All or DataScope.College)
+            return true;
+        return scope.IsInRole(SystemRoles.Teacher) &&
+               session.Instructors.Any(instructor =>
+                   instructor.Teacher?.UserId == scope.UserId);
+    }
+
     private bool CanCorrectPublishedProject(TeachingTask task)
     {
         var scope = currentUserDataScope.Current;
@@ -1569,6 +1661,12 @@ public sealed class ExperimentsController(
             return "实验安排方式无效。";
         if (request.StartDate > request.EndDate)
             return "项目开始日期不能晚于结束日期。";
+        if (request.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
+            request.SelectionStartsAt.HasValue != request.SelectionEndsAt.HasValue)
+            return "开始选课和截至选课时间需要同时填写。";
+        if (request.SelectionStartsAt.HasValue && request.SelectionEndsAt.HasValue &&
+            request.SelectionStartsAt >= request.SelectionEndsAt)
+            return "开始选课时间必须早于截至选课时间。";
         if (request.StartDate < term.StartDate ||
             request.EndDate > term.EndDate)
             return "实验项目日期必须在所属学期起止日期内。";
@@ -1602,6 +1700,15 @@ public sealed class ExperimentsController(
     private static string? Normalize(string? value) =>
         string.IsNullOrWhiteSpace(value) ? null : value.Trim();
 
+    private static DateTime? NormalizeSelectionTime(DateTime? value)
+    {
+        if (!value.HasValue) return null;
+        if (value.Value.Kind == DateTimeKind.Utc) return value.Value;
+        var china = TimeZoneInfo.FindSystemTimeZoneById("China Standard Time");
+        return TimeZoneInfo.ConvertTimeToUtc(
+            DateTime.SpecifyKind(value.Value, DateTimeKind.Unspecified), china);
+    }
+
     private static List<string>? NormalizeBatchProjectNames(IReadOnlyList<string>? names)
     {
         if (names is null || names.Count == 0) return null;
@@ -1626,7 +1733,9 @@ public sealed record ExperimentProjectRequest(
     [MaxLength(1000)] string? Requirements,
     DateOnly StartDate,
     DateOnly EndDate,
-    Guid? ScheduleEntryId = null);
+    Guid? ScheduleEntryId = null,
+    DateTime? SelectionStartsAt = null,
+    DateTime? SelectionEndsAt = null);
 
 public sealed record PublishedExperimentProjectCorrectionRequest(
     [Required, MaxLength(120)] string Name,
@@ -1643,7 +1752,9 @@ public sealed record ExperimentProjectBatchRequest(
     DateOnly StartDate,
     DateOnly EndDate,
     IReadOnlyList<string>? Names = null,
-    bool GenerateSequentialNames = false)
+    bool GenerateSequentialNames = false,
+    DateTime? SelectionStartsAt = null,
+    DateTime? SelectionEndsAt = null)
 {
     public ExperimentProjectRequest ForTeachingTask(Guid teachingTaskId) =>
         new(
@@ -1654,7 +1765,10 @@ public sealed record ExperimentProjectBatchRequest(
             Description,
             Requirements,
             StartDate,
-            EndDate);
+            EndDate,
+            null,
+            SelectionStartsAt,
+            SelectionEndsAt);
 }
 
 public sealed record ExperimentProjectBulkRequest(
@@ -1670,7 +1784,8 @@ public sealed record ExperimentSessionRequest(
     [Range(1, 30)] int StartPeriod,
     [Range(1, 30)] int PeriodCount,
     [Range(1, 10000)] int Capacity,
-    [MaxLength(500)] string? Notes);
+    [MaxLength(500)] string? Notes,
+    [Required, MinLength(1)] IReadOnlyList<Guid>? InstructorTeacherIds = null);
 
 public sealed record ExperimentSessionBatchRequest(
     [Required] IReadOnlyList<ExperimentSessionBatchItem> Items);
@@ -1682,7 +1797,8 @@ public sealed record ExperimentSessionBatchItem(
     [Range(1, 30)] int StartPeriod,
     [Range(1, 30)] int PeriodCount,
     [Range(1, 10000)] int Capacity,
-    [MaxLength(500)] string? Notes)
+    [MaxLength(500)] string? Notes,
+    [Required, MinLength(1)] IReadOnlyList<Guid>? InstructorTeacherIds = null)
 {
     public ExperimentSessionRequest ToSessionRequest() =>
         new(
@@ -1691,7 +1807,8 @@ public sealed record ExperimentSessionBatchItem(
             StartPeriod,
             PeriodCount,
             Capacity,
-            Notes);
+            Notes,
+            InstructorTeacherIds);
 }
 
 public sealed record ExperimentPeriodOption(

src/Jiaowu.Api/Domain/Academic/ExperimentEntities.cs

@@ -18,6 +18,9 @@ public sealed class ExperimentProject : EntityBase
     public string? Requirements { get; set; }
     public DateOnly StartDate { get; set; }
     public DateOnly EndDate { get; set; }
+    // 自主预约项目可单独控制学生可选场次的时间窗口（UTC 时刻）。
+    public DateTime? SelectionStartsAt { get; set; }
+    public DateTime? SelectionEndsAt { get; set; }
     public ExperimentProjectStatus Status { get; set; } =
         ExperimentProjectStatus.Draft;
     public DateTime? PublishedAt { get; set; }
@@ -43,6 +46,15 @@ public sealed class ExperimentSession : EntityBase
         ExperimentSessionStatus.Scheduled;
     public DateTime? CancelledAt { get; set; }
     public ICollection<ExperimentBooking> Bookings { get; set; } = [];
+    public ICollection<ExperimentSessionInstructor> Instructors { get; set; } = [];
+}
+
+public sealed class ExperimentSessionInstructor : EntityBase
+{
+    public Guid ExperimentSessionId { get; set; }
+    public ExperimentSession? ExperimentSession { get; set; }
+    public Guid TeacherId { get; set; }
+    public Teacher? Teacher { get; set; }
 }
 
 public sealed class ExperimentBooking : EntityBase