已改成“普通排课与实验学时分离”：

普通课表学时 = 总学时 − 实践学时。自动排课、手工排课、课表发布都会阻止把实践学时重复排入。全部为实践学时的课程应设为“非排时课程”，再由实验管理安排。教学任务和排课页面会显示“常规 / 实践学时”。已有教学任务即使仍保存旧周学时，排课时也会按拆分后的课程学时计算。无需数据库迁移。
2026-07-29 09:57:49 +08:00
parent 356c410788
commit 692b521453
14 changed files with 525 additions and 30 deletions
@@ -136,6 +136,91 @@ public sealed class AutomaticScheduleGeneratorTests
        Assert.Empty(await db.ScheduleEntries.ToListAsync());
    }

+    [Fact]
+    public async Task Generator_excludes_practice_hours_from_regular_schedule()
+    {
+        await using var connection = new SqliteConnection("Data Source=:memory:");
+        await connection.OpenAsync();
+        var options = new DbContextOptionsBuilder<AppDbContext>()
+            .UseSqlite(connection)
+            .Options;
+        await using var db = new AppDbContext(options);
+        await db.Database.EnsureCreatedAsync();
+
+        var term = new AcademicTerm
+        {
+            Code = "2026-LAB",
+            Name = "2026 实验学时测试",
+            AcademicYear = "2026-2027",
+            Season = TermSeason.Autumn,
+            StartDate = new DateOnly(2026, 9, 1),
+            EndDate = new DateOnly(2027, 1, 15)
+        };
+        var college = new College { Code = "LAB", Name = "实验学院" };
+        var course = new Course
+        {
+            Code = "LAB-01",
+            Name = "实验混合课程",
+            College = college,
+            Credits = 2,
+            TotalHours = 32,
+            LectureHours = 16,
+            PracticeHours = 16
+        };
+        var task = new TeachingTask
+        {
+            TaskNumber = "TASK-LAB",
+            Name = "实验混合教学班",
+            AcademicTerm = term,
+            Course = course,
+            Capacity = 30,
+            StartWeek = 1,
+            EndWeek = 16,
+            WeeklyHours = 2,
+            Status = TeachingTaskStatus.Published
+        };
+        var plan = new SchedulePlan
+        {
+            AcademicTerm = term,
+            Name = "实验学时拆分测试",
+            Version = "V1"
+        };
+        db.AddRange(term, college, course, task, plan);
+        db.ScheduleTimeSlots.AddRange(
+            new ScheduleTimeSlot
+            {
+                AcademicTerm = term,
+                PeriodNumber = 1,
+                Name = "第 1 节",
+                StartsAt = new TimeOnly(8, 0),
+                EndsAt = new TimeOnly(8, 45)
+            },
+            new ScheduleTimeSlot
+            {
+                AcademicTerm = term,
+                PeriodNumber = 2,
+                Name = "第 2 节",
+                StartsAt = new TimeOnly(8, 55),
+                EndsAt = new TimeOnly(9, 40)
+            });
+        db.TeachingTaskScheduleConstraints.Add(
+            new TeachingTaskScheduleConstraint
+            {
+                TeachingTask = task,
+                RequiresClassroom = false
+            });
+        await db.SaveChangesAsync();
+
+        var result = await new AutomaticScheduleGenerator(db)
+            .GenerateAsync(plan, CancellationToken.None);
+
+        Assert.Equal(1, result.CreatedEntries);
+        Assert.Equal(1, result.CompletedTasks);
+        Assert.Equal(
+            1,
+            (await db.ScheduleEntries.SingleAsync()).PeriodCount);
+    }
+
    [Fact]
    public async Task Generator_schedules_roomless_course_within_allowed_time()
    {
@@ -12,7 +12,7 @@ public sealed class SchedulePublishJobProcessorTests
    [Fact]
    public async Task Processor_validates_and_publishes_plan_atomically()
    {
-        var result = await RunPublishAsync(weeklyHours: 2);
+        var result = await RunPublishAsync(weeklyHours: 2, scheduledHours: 2);

        Assert.Equal(SchedulePublishJobStatus.Succeeded, result.JobStatus);
        Assert.Equal(SchedulePlanStatus.Published, result.PlanStatus);
@@ -26,17 +26,46 @@ public sealed class SchedulePublishJobProcessorTests
    [Fact]
    public async Task Processor_keeps_draft_when_validation_fails()
    {
-        var result = await RunPublishAsync(weeklyHours: 4);
+        var result = await RunPublishAsync(weeklyHours: 2, scheduledHours: 1);

        Assert.Equal(SchedulePublishJobStatus.Failed, result.JobStatus);
        Assert.Equal(SchedulePlanStatus.Draft, result.PlanStatus);
        Assert.Null(result.ActiveAcademicTermId);
        Assert.Equal("检查未通过", result.CurrentStep);
-        Assert.Contains("尚未达到每周 4 学时", result.ErrorMessage);
+        Assert.Contains("尚未达到每周 2 个普通排课学时", result.ErrorMessage);
        Assert.Null(result.PublishedAt);
    }

-    private static async Task<PublishResult> RunPublishAsync(int weeklyHours)
+    [Fact]
+    public async Task Processor_excludes_practice_hours_for_existing_tasks()
+    {
+        var result = await RunPublishAsync(
+            weeklyHours: 2,
+            scheduledHours: 1,
+            practiceHours: 16);
+
+        Assert.Equal(SchedulePublishJobStatus.Succeeded, result.JobStatus);
+        Assert.Equal(SchedulePlanStatus.Published, result.PlanStatus);
+    }
+
+    [Fact]
+    public async Task Processor_rejects_practice_hours_already_added_to_draft()
+    {
+        var result = await RunPublishAsync(
+            weeklyHours: 2,
+            scheduledHours: 2,
+            practiceHours: 16);
+
+        Assert.Equal(SchedulePublishJobStatus.Failed, result.JobStatus);
+        Assert.Equal(SchedulePlanStatus.Draft, result.PlanStatus);
+        Assert.Contains("普通课表应为 1 学时", result.ErrorMessage);
+        Assert.Contains("删除已包含的实践学时", result.ErrorMessage);
+    }
+
+    private static async Task<PublishResult> RunPublishAsync(
+        int weeklyHours,
+        int scheduledHours,
+        int practiceHours = 0)
    {
        var databasePath = Path.Combine(
            Path.GetTempPath(),
@@ -75,7 +104,8 @@ public sealed class SchedulePublishJobProcessorTests
                    College = college,
                    Credits = 1,
                    TotalHours = 32,
-                    LectureHours = 32
+                    LectureHours = 32 - practiceHours,
+                    PracticeHours = practiceHours
                };
                var task = new TeachingTask
                {
@@ -100,7 +130,7 @@ public sealed class SchedulePublishJobProcessorTests
                    TeachingTask = task,
                    DayOfWeek = 1,
                    StartPeriod = 1,
-                    PeriodCount = 2,
+                    PeriodCount = scheduledHours,
                    StartWeek = 1,
                    EndWeek = 16,
                    WeekPattern = WeekPattern.All
@@ -189,6 +189,8 @@ public sealed class ScheduleSettingsControllerTests
            });
        Assert.Contains("测试教师", json);
        Assert.Contains(classroom.Id.ToString(), json);
+        Assert.Contains("\"WeeklyHours\":3", json);
+        Assert.Contains("\"CoursePracticeHours\":16", json);
    }

    [Fact]
@@ -12,6 +12,114 @@ namespace Jiaowu.Api.Tests;

 public sealed class SchedulesControllerTests
 {
+    [Fact]
+    public async Task Manual_entry_rejects_hours_reserved_for_experiments()
+    {
+        await using var connection = new SqliteConnection("Data Source=:memory:");
+        await connection.OpenAsync();
+        var options = new DbContextOptionsBuilder<AppDbContext>()
+            .UseSqlite(connection)
+            .Options;
+        await using var db = new AppDbContext(options);
+        await db.Database.EnsureCreatedAsync();
+
+        var term = new AcademicTerm
+        {
+            Code = "2026-LAB",
+            Name = "2026 实验学时测试",
+            AcademicYear = "2026-2027",
+            Season = TermSeason.Autumn,
+            StartDate = new DateOnly(2026, 9, 7),
+            EndDate = new DateOnly(2027, 1, 17)
+        };
+        var college = new College { Code = "LAB", Name = "实验学院" };
+        var course = new Course
+        {
+            Code = "LAB-01",
+            Name = "实验混合课程",
+            College = college,
+            Credits = 2,
+            TotalHours = 32,
+            LectureHours = 16,
+            PracticeHours = 16
+        };
+        var task = new TeachingTask
+        {
+            TaskNumber = "TASK-LAB",
+            Name = "实验混合教学班",
+            AcademicTerm = term,
+            Course = course,
+            Capacity = 30,
+            StartWeek = 1,
+            EndWeek = 16,
+            WeeklyHours = 2,
+            Status = TeachingTaskStatus.Published
+        };
+        var plan = new SchedulePlan
+        {
+            AcademicTerm = term,
+            Name = "排课草稿",
+            Version = "V1"
+        };
+        plan.Entries.Add(new ScheduleEntry
+        {
+            TeachingTask = task,
+            DayOfWeek = 1,
+            StartPeriod = 1,
+            PeriodCount = 1,
+            StartWeek = 1,
+            EndWeek = 16,
+            WeekPattern = WeekPattern.All
+        });
+        db.AddRange(term, college, course, task, plan);
+        db.ScheduleTimeSlots.AddRange(
+            new ScheduleTimeSlot
+            {
+                AcademicTerm = term,
+                PeriodNumber = 1,
+                Name = "第 1 节",
+                StartsAt = new TimeOnly(8, 0),
+                EndsAt = new TimeOnly(8, 45)
+            },
+            new ScheduleTimeSlot
+            {
+                AcademicTerm = term,
+                PeriodNumber = 2,
+                Name = "第 2 节",
+                StartsAt = new TimeOnly(8, 55),
+                EndsAt = new TimeOnly(9, 40)
+            });
+        db.TeachingTaskScheduleConstraints.Add(
+            new TeachingTaskScheduleConstraint
+            {
+                TeachingTask = task,
+                RequiresClassroom = false
+            });
+        await db.SaveChangesAsync();
+
+        var controller = new SchedulesController(db);
+        var result = await controller.CreateEntry(
+            plan.Id,
+            new ScheduleEntryRequest(
+                task.Id,
+                null,
+                2,
+                2,
+                1,
+                1,
+                16,
+                WeekPattern.All,
+                null),
+            CancellationToken.None);
+
+        var problem = Assert.IsType<ObjectResult>(result);
+        var details = Assert.IsType<ValidationProblemDetails>(problem.Value);
+        Assert.Contains(
+            "实践学时请在实验管理中安排",
+            details.Detail);
+        Assert.Single(await db.ScheduleEntries.ToListAsync());
+    }
+
    [Fact]
    public async Task Publish_returns_accepted_before_background_validation_runs()
    {
@@ -30,4 +30,57 @@ public sealed class TeachingTaskHoursTests
        Assert.Contains("总学时为 32", result);
        Assert.Contains("共 16 学时", result);
    }
+
+    [Fact]
+    public void Standard_schedule_excludes_practice_hours()
+    {
+        var course = new Course
+        {
+            Code = "TEST-LAB",
+            Name = "实验混合课程",
+            CollegeId = Guid.NewGuid(),
+            Credits = 4,
+            TotalHours = 64,
+            LectureHours = 48,
+            PracticeHours = 16
+        };
+
+        Assert.Equal(48, TeachingTaskHours.RegularScheduleHours(course));
+        Assert.True(TeachingTaskHours.TryResolveRegularWeeklyHours(
+            course,
+            1,
+            16,
+            out var weeklyHours));
+        Assert.Equal(3, weeklyHours);
+        Assert.Null(TeachingTaskHours.Validate(course, 1, 16, 3));
+
+        var result = TeachingTaskHours.Validate(course, 1, 16, 4);
+        Assert.NotNull(result);
+        Assert.Contains("普通课表应安排 48 学时", result);
+        Assert.Contains("实践学时 16", result);
+    }
+
+    [Fact]
+    public void Flexible_schedule_keeps_total_workload_hours()
+    {
+        var course = new Course
+        {
+            Code = "TEST-PRACTICE",
+            Name = "实践课程",
+            CollegeId = Guid.NewGuid(),
+            Credits = 1,
+            TotalHours = 16,
+            PracticeHours = 16
+        };
+
+        Assert.Null(TeachingTaskHours.Validate(
+            course,
+            1,
+            16,
+            1,
+            TeachingTaskSchedulingMode.Flexible));
+        Assert.Contains(
+            "无需进入普通课表",
+            TeachingTaskHours.Validate(course, 1, 16, 1)!);
+    }
 }