自选项目实验优化

2026-08-11 09:29:44 +08:00
parent 9b32ee916c
commit e69ab6f580
11 changed files with 7578 additions and 67 deletions
@@ -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);
@@ -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) ||
-            request.Items.Select(x => x.ProjectId).Distinct().Count() !=
-            request.Items.Count)
+        if (request.Items.Any(x => x.ProjectId == Guid.Empty))
            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 ||
-            !await ScopedProjects().AnyAsync(
-                x => x.Id == session.ExperimentProjectId,
-                cancellationToken))
-            return NotFound();
+        if (session is null) return NotFound();
+        if (!CanManageSession(session)) return Forbid();
        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 ||
-            !await ScopedProjects().AnyAsync(
-                x => x.Id == session.ExperimentProjectId,
-                cancellationToken))
-            return NotFound();
+        if (session is null) return NotFound();
+        if (!CanManageSession(session)) return Forbid();

        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(
@@ -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
@@ -263,6 +263,7 @@ public sealed class ExamPublishJobProcessor(

        var projects = await db.ExperimentProjects
            .Include(x => x.Sessions)
+            .ThenInclude(x => x.Instructors)
            .Include(x => x.TeachingTask)
            .ThenInclude(x => x!.Course)
            .Where(x => ids.Contains(x.Id))
@@ -282,6 +283,14 @@ public sealed class ExamPublishJobProcessor(
            if (project.Sessions.Any(x => x.Status == ExperimentSessionStatus.Scheduled &&
                (x.SessionDate < project.StartDate || x.SessionDate > project.EndDate)))
                throw new ExamPublishValidationException($"“{project.Name}”存在不在开放日期范围内的实验场次。");
+            if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
+                (project.SelectionStartsAt is null || project.SelectionEndsAt is null ||
+                 project.SelectionStartsAt >= project.SelectionEndsAt))
+                throw new ExamPublishValidationException($"“{project.Name}”未设置有效的选课时间范围。");
+            if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
+                project.Sessions.Any(x => x.Status == ExperimentSessionStatus.Scheduled &&
+                                          x.Instructors.Count == 0))
+                throw new ExamPublishValidationException($"“{project.Name}”存在未指定指导老师的实验场次。");
        }

        job.CurrentStep = "正在发布实验项目";
@@ -51,6 +51,8 @@ public sealed class AppDbContext(DbContextOptions<AppDbContext> options)
        Set<ClassroomReservation>();
    public DbSet<ExperimentProject> ExperimentProjects => Set<ExperimentProject>();
    public DbSet<ExperimentSession> ExperimentSessions => Set<ExperimentSession>();
+    public DbSet<ExperimentSessionInstructor> ExperimentSessionInstructors =>
+        Set<ExperimentSessionInstructor>();
    public DbSet<ExperimentBooking> ExperimentBookings => Set<ExperimentBooking>();
    public DbSet<ExperimentGradeSheet> ExperimentGradeSheets =>
        Set<ExperimentGradeSheet>();
@@ -690,6 +692,8 @@ public sealed class AppDbContext(DbContextOptions<AppDbContext> options)
            entity.Property(x => x.Name).HasMaxLength(120);
            entity.Property(x => x.Description).HasMaxLength(1000);
            entity.Property(x => x.Requirements).HasMaxLength(1000);
+            entity.Property(x => x.SelectionStartsAt).HasConversion<UtcDateTimeConverter>();
+            entity.Property(x => x.SelectionEndsAt).HasConversion<UtcDateTimeConverter>();
            // 集中安排会为同一教学任务的每一条实验课表记录生成项目；
            // 自行安排仍由控制器保持“教学任务 + 编码”唯一。
            entity.HasIndex(x => new
@@ -805,6 +809,19 @@ public sealed class AppDbContext(DbContextOptions<AppDbContext> options)
                .OnDelete(DeleteBehavior.Restrict);
        });

+        builder.Entity<ExperimentSessionInstructor>(entity =>
+        {
+            entity.HasIndex(x => new { x.ExperimentSessionId, x.TeacherId })
+                .IsUnique();
+            entity.HasIndex(x => x.TeacherId);
+            entity.HasOne(x => x.ExperimentSession).WithMany(x => x.Instructors)
+                .HasForeignKey(x => x.ExperimentSessionId)
+                .OnDelete(DeleteBehavior.Cascade);
+            entity.HasOne(x => x.Teacher).WithMany()
+                .HasForeignKey(x => x.TeacherId)
+                .OnDelete(DeleteBehavior.Restrict);
+        });
+
        builder.Entity<ExperimentCourseGrade>(entity =>
        {
            entity.Property(x => x.WeightedAverageScore).HasPrecision(5, 1);
@@ -104,6 +104,8 @@ public sealed class DevelopmentSqliteMigrator(
        "20260809_54_experiment_course_grades";
    private const string NotificationInboxIndexesMigration =
        "20260810_55_notification_inbox_indexes";
+    private const string SelfScheduledExperimentSelectionMigration =
+        "20260811_56_self_scheduled_experiment_selection";

    public async Task MigrateAsync(CancellationToken cancellationToken = default)
    {
@@ -737,6 +739,10 @@ public sealed class DevelopmentSqliteMigrator(
            NotificationInboxIndexesMigration,
            NotificationInboxIndexesStatements,
            cancellationToken);
+        await ApplyMigrationAsync(
+            SelfScheduledExperimentSelectionMigration,
+            SelfScheduledExperimentSelectionStatements,
+            cancellationToken);
    }

    private async Task ApplyMigrationAsync(
@@ -3129,6 +3135,27 @@ public sealed class DevelopmentSqliteMigrator(
        """
    ];

+    private static readonly string[] SelfScheduledExperimentSelectionStatements =
+    [
+        "ALTER TABLE \"ExperimentProjects\" ADD COLUMN \"SelectionStartsAt\" TEXT NULL;",
+        "ALTER TABLE \"ExperimentProjects\" ADD COLUMN \"SelectionEndsAt\" TEXT NULL;",
+        """
+        CREATE TABLE "ExperimentSessionInstructors" (
+            "Id" TEXT NOT NULL CONSTRAINT "PK_ExperimentSessionInstructors" PRIMARY KEY,
+            "ExperimentSessionId" TEXT NOT NULL,
+            "TeacherId" TEXT NOT NULL,
+            "CreatedAt" TEXT NOT NULL,
+            "UpdatedAt" TEXT NOT NULL,
+            CONSTRAINT "FK_ExperimentSessionInstructors_ExperimentSessions_ExperimentSessionId"
+                FOREIGN KEY ("ExperimentSessionId") REFERENCES "ExperimentSessions" ("Id") ON DELETE CASCADE,
+            CONSTRAINT "FK_ExperimentSessionInstructors_Teachers_TeacherId"
+                FOREIGN KEY ("TeacherId") REFERENCES "Teachers" ("Id") ON DELETE RESTRICT
+        );
+        """,
+        "CREATE UNIQUE INDEX \"IX_ExperimentSessionInstructors_ExperimentSessionId_TeacherId\" ON \"ExperimentSessionInstructors\" (\"ExperimentSessionId\", \"TeacherId\");",
+        "CREATE INDEX \"IX_ExperimentSessionInstructors_TeacherId\" ON \"ExperimentSessionInstructors\" (\"TeacherId\");"
+    ];
+
    private static readonly string[] ReusableCourseGroupsStatements =
    [
        """
@@ -0,0 +1,81 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
+{
+    /// <inheritdoc />
+    public partial class AddSelfScheduledExperimentSelectionWindowsAndInstructors : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "SelectionEndsAt",
+                table: "ExperimentProjects",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "SelectionStartsAt",
+                table: "ExperimentProjects",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "ExperimentSessionInstructors",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false),
+                    ExperimentSessionId = table.Column<Guid>(type: "char(36)", nullable: false),
+                    TeacherId = table.Column<Guid>(type: "char(36)", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ExperimentSessionInstructors", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ExperimentSessionInstructors_ExperimentSessions_ExperimentSe~",
+                        column: x => x.ExperimentSessionId,
+                        principalTable: "ExperimentSessions",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ExperimentSessionInstructors_Teachers_TeacherId",
+                        column: x => x.TeacherId,
+                        principalTable: "Teachers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                })
+                .Annotation("MySQL:Charset", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ExperimentSessionInstructors_ExperimentSessionId_TeacherId",
+                table: "ExperimentSessionInstructors",
+                columns: new[] { "ExperimentSessionId", "TeacherId" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ExperimentSessionInstructors_TeacherId",
+                table: "ExperimentSessionInstructors",
+                column: "TeacherId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ExperimentSessionInstructors");
+
+            migrationBuilder.DropColumn(
+                name: "SelectionEndsAt",
+                table: "ExperimentProjects");
+
+            migrationBuilder.DropColumn(
+                name: "SelectionStartsAt",
+                table: "ExperimentProjects");
+        }
+    }
+}
@@ -2520,6 +2520,12 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
                    b.Property<int?>("ScheduleWeek")
                        .HasColumnType("int");

+                    b.Property<DateTime?>("SelectionEndsAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("SelectionStartsAt")
+                        .HasColumnType("datetime(6)");
+
                    b.Property<DateTime>("StartDate")
                        .HasColumnType("date");

@@ -2596,6 +2602,34 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
                    b.ToTable("ExperimentSessions");
                });

+            modelBuilder.Entity("Jiaowu.Api.Domain.Academic.ExperimentSessionInstructor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ExperimentSessionId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TeacherId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TeacherId");
+
+                    b.HasIndex("ExperimentSessionId", "TeacherId")
+                        .IsUnique();
+
+                    b.ToTable("ExperimentSessionInstructors");
+                });
+
            modelBuilder.Entity("Jiaowu.Api.Domain.Academic.GradeItem", b =>
                {
                    b.Property<Guid>("Id")
@@ -5970,6 +6004,25 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
                    b.Navigation("ExperimentProject");
                });

+            modelBuilder.Entity("Jiaowu.Api.Domain.Academic.ExperimentSessionInstructor", b =>
+                {
+                    b.HasOne("Jiaowu.Api.Domain.Academic.ExperimentSession", "ExperimentSession")
+                        .WithMany("Instructors")
+                        .HasForeignKey("ExperimentSessionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jiaowu.Api.Domain.Academic.Teacher", "Teacher")
+                        .WithMany()
+                        .HasForeignKey("TeacherId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("ExperimentSession");
+
+                    b.Navigation("Teacher");
+                });
+
            modelBuilder.Entity("Jiaowu.Api.Domain.Academic.GradeItem", b =>
                {
                    b.HasOne("Jiaowu.Api.Domain.Academic.GradeSheet", "GradeSheet")
@@ -6843,6 +6896,8 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
            modelBuilder.Entity("Jiaowu.Api.Domain.Academic.ExperimentSession", b =>
                {
                    b.Navigation("Bookings");
+
+                    b.Navigation("Instructors");
                });

            modelBuilder.Entity("Jiaowu.Api.Domain.Academic.GradeItem", b =>
@@ -161,7 +161,8 @@ public sealed class ExperimentsControllerTests
                    1,
                    2,
                    20,
-                    null),
+                    null,
+                    [fixture.Teacher.Id]),
                new ExperimentSessionBatchItem(
                    projectIds[1],
                    fixture.Classroom.Id,
@@ -169,7 +170,8 @@ public sealed class ExperimentsControllerTests
                    1,
                    2,
                    20,
-                    null)
+                    null,
+                    [fixture.Teacher.Id])
            ]),
            CancellationToken.None);

@@ -202,7 +204,8 @@ public sealed class ExperimentsControllerTests
                    1,
                    2,
                    20,
-                    null),
+                    null,
+                    [fixture.Teacher.Id]),
                new ExperimentSessionBatchItem(
                    projectIds[1],
                    fixture.SecondClassroom.Id,
@@ -210,7 +213,8 @@ public sealed class ExperimentsControllerTests
                    1,
                    2,
                    20,
-                    null)
+                    null,
+                    [fixture.Teacher.Id])
            ]),
            CancellationToken.None);

@@ -218,6 +222,65 @@ public sealed class ExperimentsControllerTests
        Assert.Equal(2, await fixture.Db.ExperimentSessions.CountAsync());
    }

+    [Fact]
+    public async Task SelfScheduledProject_AllowsMultipleCandidateSessionsAndRequiresSelectionWindow()
+    {
+        await using var fixture = await ExperimentFixture.CreateAsync();
+        var manager = fixture.Controller(fixture.ManagerScope);
+        var request = fixture.ProjectRequest(ExperimentArrangementMode.SelfScheduled) with
+        {
+            SelectionStartsAt = DateTime.UtcNow.AddHours(1),
+            SelectionEndsAt = DateTime.UtcNow.AddDays(1)
+        };
+        await manager.CreateProject(request, CancellationToken.None);
+        var project = await fixture.Db.ExperimentProjects.SingleAsync();
+
+        var result = await manager.CreateSessions(
+            new ExperimentSessionBatchRequest(
+            [
+                new ExperimentSessionBatchItem(project.Id, fixture.Classroom.Id,
+                    fixture.Term.StartDate, 1, 2, 20, null, [fixture.Teacher.Id]),
+                new ExperimentSessionBatchItem(project.Id, fixture.SecondClassroom.Id,
+                    fixture.Term.StartDate, 4, 2, 20, null, [fixture.Teacher.Id])
+            ]),
+            CancellationToken.None);
+
+        Assert.IsType<CreatedResult>(result);
+        Assert.Equal(2, await fixture.Db.ExperimentSessions.CountAsync());
+        Assert.Equal(2, await fixture.Db.ExperimentSessionInstructors.CountAsync());
+        Assert.IsType<NoContentResult>(await manager.PublishProject(project.Id, CancellationToken.None));
+        var session = await fixture.Db.ExperimentSessions.OrderBy(x => x.StartPeriod).FirstAsync();
+        Assert.IsType<ConflictObjectResult>(
+            await fixture.Controller(fixture.StudentScope).Book(session.Id, CancellationToken.None));
+    }
+
+    [Fact]
+    public async Task BoundInstructor_CanCancelOwnSession()
+    {
+        await using var fixture = await ExperimentFixture.CreateAsync();
+        var manager = fixture.Controller(fixture.ManagerScope);
+        await manager.CreateProject(
+            fixture.ProjectRequest(ExperimentArrangementMode.SelfScheduled),
+            CancellationToken.None);
+        var project = await fixture.Db.ExperimentProjects.SingleAsync();
+        Assert.IsType<CreatedResult>(await manager.CreateSession(
+            project.Id, fixture.SessionRequest(1, 2, 20), CancellationToken.None));
+        var session = await fixture.Db.ExperimentSessions.SingleAsync();
+        Assert.IsType<NoContentResult>(await manager.PublishProject(project.Id, CancellationToken.None));
+
+        var instructorScope = new FixedScope(new CurrentUserScope(
+            fixture.Teacher.UserId!.Value,
+            fixture.Teacher.Name,
+            null,
+            DataScope.Self,
+            new HashSet<string>([SystemRoles.Teacher])));
+
+        Assert.IsType<NoContentResult>(await fixture.Controller(instructorScope)
+            .CancelSession(session.Id, CancellationToken.None));
+        Assert.Equal(ExperimentSessionStatus.Cancelled,
+            (await fixture.Db.ExperimentSessions.SingleAsync()).Status);
+    }
+
    [Fact]
    public async Task CentralizedProject_PublishesWhenBoundToPublishedExperimentSchedule()
    {
@@ -509,6 +572,7 @@ public sealed class ExperimentsControllerTests
            AppDbContext db,
            AcademicTerm term,
            TeachingTask task,
+            Teacher teacher,
            Classroom classroom,
            Classroom secondClassroom,
            ScheduleEntry scheduleEntry,
@@ -519,6 +583,7 @@ public sealed class ExperimentsControllerTests
            Db = db;
            Term = term;
            Task = task;
+            Teacher = teacher;
            Classroom = classroom;
            SecondClassroom = secondClassroom;
            ScheduleEntry = scheduleEntry;
@@ -530,6 +595,7 @@ public sealed class ExperimentsControllerTests
        public AppDbContext Db { get; }
        public AcademicTerm Term { get; }
        public TeachingTask Task { get; }
+        public Teacher Teacher { get; }
        public Classroom Classroom { get; }
        public Classroom SecondClassroom { get; }
        public ScheduleEntry ScheduleEntry { get; }
@@ -600,7 +666,8 @@ public sealed class ExperimentsControllerTests
            {
                TeacherNumber = "T2099",
                Name = "实验教师",
-                CollegeId = college.Id
+                CollegeId = college.Id,
+                UserId = manager.Id
            };
            var term = new AcademicTerm
            {
@@ -655,7 +722,15 @@ public sealed class ExperimentsControllerTests
                AcademicTermId = term.Id,
                CourseId = course.Id,
                Capacity = 40,
-                Status = TeachingTaskStatus.Published
+                Status = TeachingTaskStatus.Published,
+                Teachers =
+                [
+                    new TeachingTaskTeacher
+                    {
+                        TeacherId = teacher.Id,
+                        IsPrimary = true
+                    }
+                ]
            };
            db.AddRange(
                manager,
@@ -712,6 +787,7 @@ public sealed class ExperimentsControllerTests
                db,
                term,
                task,
+                teacher,
                classroom,
                secondClassroom,
                scheduleEntry,
@@ -744,7 +820,13 @@ public sealed class ExperimentsControllerTests
                "携带校园卡。",
                Term.StartDate,
                Term.StartDate.AddDays(14),
-                mode == ExperimentArrangementMode.Centralized ? ScheduleEntry.Id : null);
+                mode == ExperimentArrangementMode.Centralized ? ScheduleEntry.Id : null,
+                mode == ExperimentArrangementMode.SelfScheduled
+                    ? new DateTime(2020, 1, 1, 8, 0, 0)
+                    : null,
+                mode == ExperimentArrangementMode.SelfScheduled
+                    ? new DateTime(2100, 1, 1, 18, 0, 0)
+                    : null);

        public ExperimentProjectBatchRequest BatchProjectRequest(
            ExperimentArrangementMode mode) =>
@@ -771,7 +853,8 @@ public sealed class ExperimentsControllerTests
                startPeriod,
                periodCount,
                capacity,
-                null);
+                null,
+                [Teacher.Id]);

        public async ValueTask DisposeAsync()
        {
@@ -25,6 +25,7 @@ const options = reactive({
  colleges: [] as any[],
  scheduleEntries: [] as any[],
  classrooms: [] as any[],
+  teachers: [] as any[],
  periods: [] as any[],
 })
 const modeFilter = ref('')
@@ -49,6 +50,7 @@ const projectForm = reactive({
  description: '',
  requirements: '',
  dates: [] as string[],
+  selectionTimes: [] as string[],
 })

 const batchRenameDialog = ref(false)
@@ -64,6 +66,7 @@ const sessionForm = reactive({
  periodCount: 2,
  capacity: 30,
  notes: '',
+  instructorTeacherIds: [] as string[],
 })

 const batchSessionDialog = ref(false)
@@ -171,6 +174,7 @@ function resetProjectForm() {
    description: '',
    requirements: '',
    dates: [],
+    selectionTimes: [],
  })
 }

@@ -211,6 +215,8 @@ function openEditProject(project: any) {
    description: project.description ?? '',
    requirements: project.requirements ?? '',
    dates: [project.startDate, project.endDate],
+    selectionTimes: project.selectionStartsAt && project.selectionEndsAt
+      ? [project.selectionStartsAt, project.selectionEndsAt] : [],
  })
  projectDialog.value = true
 }
@@ -234,10 +240,11 @@ async function saveProject() {
  if ((!correctingPublishedProject.value && !projectForm.teachingTaskIds.length) ||
    (editingProjectId.value && projectForm.arrangementMode === 'Centralized' && !projectForm.scheduleEntryId) ||
    !projectForm.code.trim()
-    || !hasValidName || projectForm.dates.length !== 2) {
+    || !hasValidName || projectForm.dates.length !== 2
+    || (projectForm.arrangementMode === 'SelfScheduled' && projectForm.selectionTimes.length !== 2)) {
    ElMessage.warning(projectForm.arrangementMode === 'Centralized' && editingProjectId.value
      ? '请选择课表实验课，并填写项目编码、名称和开放日期'
-      : '请填写教学任务、项目编码、名称和开放日期')
+      : '请填写教学任务、项目编码、名称、开放日期和选课时间')
    return
  }
  const payload = {
@@ -250,6 +257,10 @@ async function saveProject() {
    requirements: projectForm.requirements || null,
    startDate: projectForm.dates[0],
    endDate: projectForm.dates[1],
+    selectionStartsAt: projectForm.arrangementMode === 'SelfScheduled'
+      ? projectForm.selectionTimes[0] || null : null,
+    selectionEndsAt: projectForm.arrangementMode === 'SelfScheduled'
+      ? projectForm.selectionTimes[1] || null : null,
  }
  try {
    if (correctingPublishedProject.value) {
@@ -288,24 +299,47 @@ function openBatchSession() {
 }

 function syncBatchSessionRows() {
-  const existing = new Map(batchSessionRows.value.map((row) => [row.projectId, row]))
-  batchSessionRows.value = batchSessionProjectIds.value.map((projectId) => {
+  const existing = new Map<string, any[]>()
+  batchSessionRows.value.forEach((row) => {
+    const rows = existing.get(row.projectId) ?? []
+    rows.push(row)
+    existing.set(row.projectId, rows)
+  })
+  batchSessionRows.value = batchSessionProjectIds.value.flatMap((projectId) => {
    const current = existing.get(projectId)
-    if (current) return current
+    if (current?.length) return current
+    return [newBatchSessionRow(projectId)]
+  })
+}
+
+function newBatchSessionRow(projectId: string, source?: any) {
  const project = projects.value.find((item) => item.id === projectId)
  const firstPeriod = options.periods.find((item) =>
    item.academicTermId === project?.academicTermId,
  )
  return {
+    rowKey: crypto.randomUUID(),
    projectId,
-      classroomId: '',
-      sessionDate: project?.startDate ?? '',
-      startPeriod: firstPeriod?.periodNumber,
-      periodCount: 2,
-      capacity: 30,
+    classroomId: source?.classroomId ?? '',
+    sessionDate: source?.sessionDate ?? project?.startDate ?? '',
+    startPeriod: source?.startPeriod ?? firstPeriod?.periodNumber,
+    periodCount: source?.periodCount ?? 2,
+    capacity: source?.capacity ?? 30,
    notes: '',
+    instructorTeacherIds: source?.instructorTeacherIds ? [...source.instructorTeacherIds] : [],
  }
-  })
+}
+
+function addBatchSessionRow(projectId: string, source: any) {
+  batchSessionRows.value.push(newBatchSessionRow(projectId, source))
+}
+
+function removeBatchSessionRow(row: any) {
+  const sameProjectRows = batchSessionRows.value.filter((item) => item.projectId === row.projectId)
+  if (sameProjectRows.length === 1) {
+    batchSessionProjectIds.value = batchSessionProjectIds.value.filter((id) => id !== row.projectId)
+  }
+  batchSessionRows.value = batchSessionRows.value.filter((item) => item.rowKey !== row.rowKey)
 }

 function applyFirstBatchTime() {
@@ -336,9 +370,9 @@ async function saveBatchSessions() {
    return
  }
  if (batchSessionRows.value.some((row) =>
-    !row.classroomId || !row.sessionDate || !row.startPeriod || !row.periodCount,
+    !row.classroomId || !row.sessionDate || !row.startPeriod || !row.periodCount || !row.instructorTeacherIds?.length,
  )) {
-    ElMessage.warning('请完整填写每个项目的日期、节次、实验室和容量')
+    ElMessage.warning('请完整填写每个项目的日期、节次、实验室、指导老师和容量')
    return
  }
  try {
@@ -365,14 +399,15 @@ function openSession(project: any) {
    periodCount: 2,
    capacity: 30,
    notes: '',
+    instructorTeacherIds: [],
  })
  sessionDialog.value = true
 }

 async function saveSession() {
  if (!selectedProject.value || !sessionForm.classroomId
-    || !sessionForm.sessionDate || !sessionForm.startPeriod) {
-    ElMessage.warning('请选择实验日期、节次和教室')
+    || !sessionForm.sessionDate || !sessionForm.startPeriod || !sessionForm.instructorTeacherIds.length) {
+    ElMessage.warning('请选择实验日期、节次、实验室和指导老师')
    return
  }
  try {
@@ -435,6 +470,15 @@ async function deleteProject(project: any) {
  }
 }

+function instructorsForProject(projectId: string) {
+  return options.teachers.filter((teacher) => teacher.teachingTaskId === projectId
+    || teacher.teachingTaskId === batchProject(projectId)?.teachingTaskId)
+}
+
+function instructorsForSelectedProject() {
+  return selectedProject.value ? instructorsForProject(selectedProject.value.id) : []
+}
+
 function openBatchRename() {
  batchRenameProjectIds.value = projects.value
    .filter((project) => draftSelectedProjectIds.value.includes(project.id))
@@ -627,11 +671,13 @@ async function loadOptions() {
    options.colleges = data.colleges
    options.scheduleEntries = data.scheduleEntries
    options.classrooms = data.classrooms
+    options.teachers = data.teachers
    options.periods = data.periods
  } catch (error) {
    options.tasks = []
    options.colleges = []
    options.classrooms = []
+    options.teachers = []
    options.periods = []
    ElMessage.error(apiErrorMessage(error))
  }
@@ -829,9 +875,9 @@ onMounted(async () => {
                    <template #reference><el-button size="small" text :icon="User">查看场次与名单</el-button></template>
                    <div class="student-session-menu">
                      <div v-for="session in row.sessions" :key="session.id" class="student-session-option">
-                        <div><b>{{ formatSessionTime(session) }}</b><span>{{ session.campusName }} · {{ session.buildingName }} {{ session.classroomName }}</span></div>
-                        <el-button size="small" text @click="showParticipants(row, session)">预约名单</el-button>
-                        <el-button v-if="session.status !== 'Cancelled'" size="small" text type="danger" @click="cancelSession(row, session)">{{ row.status === 'Draft' ? '删除' : '取消' }}</el-button>
+                        <div><b>{{ formatSessionTime(session) }}</b><span>{{ session.campusName }} · {{ session.buildingName }} {{ session.classroomName }} · 指导：{{ session.instructorNames?.join('、') || '待指定' }}</span></div>
+                        <el-button v-if="session.canManage" size="small" text @click="showParticipants(row, session)">预约名单</el-button>
+                        <el-button v-if="session.canManage && session.status !== 'Cancelled'" size="small" text type="danger" @click="cancelSession(row, session)">{{ row.status === 'Draft' ? '删除' : '取消' }}</el-button>
                      </div>
                    </div>
                  </el-popover>
@@ -927,7 +973,7 @@ onMounted(async () => {
                      <div v-for="session in row.sessions" :key="session.id" class="student-session-option" :class="{ 'is-selected': row.myBooking?.experimentSessionId === session.id }">
                        <div>
                          <b>{{ formatSessionTime(session) }}</b>
-                          <span>{{ session.campusName }} · {{ session.buildingName }} {{ session.classroomName }}</span>
+                          <span>{{ session.campusName }} · {{ session.buildingName }} {{ session.classroomName }} · 指导：{{ session.instructorNames?.join('、') || '待指定' }}</span>
                        </div>
                        <el-tag :type="sessionTagType(session)" size="small" effect="plain">余 {{ session.remainingCount }} / {{ session.capacity }}</el-tag>
                        <el-button v-if="row.myBooking?.experimentSessionId === session.id" size="small" type="success" :icon="Check" disabled>已预约</el-button>
@@ -1033,9 +1079,10 @@ onMounted(async () => {
                    v-for="task in group.tasks"
                    :key="task.id"
                    :value="task.id"
-                    :disabled="projectForm.arrangementMode === 'SelfScheduled' && !!selectedTask
-                      && (task.academicTermId !== selectedTask.academicTermId
-                        || task.courseId !== selectedTask.courseId)"
+                    :disabled="projectForm.arrangementMode === 'SelfScheduled'
+                      && (task.schedulingMode !== 'Flexible'
+                        || (!!selectedTask && (task.academicTermId !== selectedTask.academicTermId
+                          || task.courseId !== selectedTask.courseId)))"
                  >
                    <b>{{ task.taskNumber }}</b>
                    <span>{{ task.classNames.join('、') || task.name }}</span>
@@ -1046,7 +1093,7 @@ onMounted(async () => {
            </el-checkbox-group>
            <small v-if="!editingProjectId" class="form-help">
              <template v-if="projectForm.arrangementMode === 'Centralized'">已选 {{ projectForm.teachingTaskIds.length }} 个教学班；系统会为每个教学班的全部已发布实验课生成项目。</template>
-              <template v-else>已选 {{ projectForm.teachingTaskIds.length }} 个教学班；只能勾选同一学期、同一课程，实验编码、名称、内容和开放日期将一次应用到这些教学任务。</template>
+              <template v-else>自行安排仅可选择“非排时课程”的教学任务；只能勾选同一学期、同一课程，实验编码、名称、内容和开放日期将一次应用到这些教学任务。</template>
            </small>
          </el-form-item>
          <div class="form-grid two">
@@ -1101,6 +1148,17 @@ onMounted(async () => {
              end-placeholder="结束日期"
            />
          </el-form-item>
+          <el-form-item v-if="projectForm.arrangementMode === 'SelfScheduled'" label="学生选课时间" required>
+            <el-date-picker
+              v-model="projectForm.selectionTimes"
+              type="datetimerange"
+              value-format="YYYY-MM-DDTHH:mm:ss"
+              range-separator="至"
+              start-placeholder="开始选课"
+              end-placeholder="截至选课"
+            />
+            <small class="form-help">仅在此时间段内，学生可以从该项目的有效实验场次中选择一次；退选或场次取消后可重新选择。</small>
+          </el-form-item>
        </div>

        <div class="form-section">
@@ -1210,6 +1268,16 @@ onMounted(async () => {
            />
          </el-select>
        </el-form-item>
+        <el-form-item label="指导老师（可多选）" required>
+          <el-select v-model="sessionForm.instructorTeacherIds" multiple filterable placeholder="选择该教学任务的指导老师">
+            <el-option
+              v-for="teacher in instructorsForSelectedProject()"
+              :key="teacher.teacherId"
+              :label="`${teacher.teacherNumber} · ${teacher.teacherName}`"
+              :value="teacher.teacherId"
+            />
+          </el-select>
+        </el-form-item>
        <el-form-item label="场次备注">
          <el-input
            v-model="sessionForm.notes"
@@ -1256,11 +1324,11 @@ onMounted(async () => {
          </el-select>
        </el-form-item>
        <div v-if="batchSessionRows.length" class="batch-session-tools">
-          <span>共 {{ batchSessionRows.length }} 条排课</span>
+          <span>共 {{ batchSessionRows.length }} 条候选时段；可为同一项目追加多个时段。</span>
          <el-button size="small" @click="applyFirstBatchTime">套用首行日期与节次</el-button>
        </div>
        <div class="batch-session-table">
-          <article v-for="(row, index) in batchSessionRows" :key="row.projectId" class="batch-session-row">
+          <article v-for="(row, index) in batchSessionRows" :key="row.rowKey" class="batch-session-row">
            <div class="batch-project-cell">
              <span>{{ index + 1 }}</span>
              <div>
@@ -1291,7 +1359,19 @@ onMounted(async () => {
                :value="room.id"
              />
            </el-select>
+            <el-select v-model="row.instructorTeacherIds" multiple filterable collapse-tags placeholder="指导老师">
+              <el-option
+                v-for="teacher in instructorsForProject(row.projectId)"
+                :key="teacher.teacherId"
+                :label="teacher.teacherName"
+                :value="teacher.teacherId"
+              />
+            </el-select>
            <el-input-number v-model="row.capacity" :min="1" :max="10000" controls-position="right" />
+            <span class="batch-session-actions">
+              <el-button size="small" text type="primary" @click="addBatchSessionRow(row.projectId, row)">追加时段</el-button>
+              <el-button size="small" text type="danger" @click="removeBatchSessionRow(row)">移除</el-button>
+            </span>
          </article>
        </div>
        <el-empty v-if="!batchSessionRows.length" :image-size="60" description="选择实验项目后，在同一张表中完成排课" />
@@ -1498,7 +1578,7 @@ onMounted(async () => {
 .batch-session-table { display: grid; gap: 8px; overflow-x: auto; padding-bottom: 4px; }
 .batch-session-row {
  display: grid;
-  grid-template-columns: minmax(230px, 1.4fr) 150px 120px 110px minmax(230px, 1.3fr) 110px;
+  grid-template-columns: minmax(210px, 1.2fr) 145px 110px 100px minmax(200px, 1.1fr) minmax(150px, .8fr) 100px auto;
  gap: 8px;
  align-items: center;
  min-width: 1000px;
@@ -1506,6 +1586,7 @@ onMounted(async () => {
  border: 1px solid #dce5e9;
  background: #f9fbfc;
 }
+.batch-session-actions { display: flex; align-items: center; gap: 2px; white-space: nowrap; }
 .batch-project-cell { display: flex; align-items: center; gap: 10px; min-width: 0; }
 .batch-project-cell > span { display: grid; width: 25px; height: 25px; place-items: center; border-radius: 50%; background: #e5f0f5; color: var(--lab-blue); font: 700 11px/1 Consolas, monospace; }
 .batch-project-cell > div { display: grid; gap: 3px; min-width: 0; }