教学任务按授课周数 × 周学时 = 课程总学时双端校验，不匹配会显示具体差额并阻止保存；公共课批量生成同样校验。

排课约束增加课程、教师、学院、授课方式、场地要求、约束状态筛选，并支持批量修改当前筛选结果。新增“非排时课程”授课方式：不进入自动排课不占星期、节次和教室不阻塞课表发布允许正常选课在班级课表和学生个人课表中单独展示
2026-07-25 08:18:25 +08:00
parent 30c15f89e5
commit fe508054d0
20 changed files with 3785 additions and 136 deletions
@@ -28,9 +28,13 @@ public sealed class TimetablesController(AppDbContext db) : ControllerBase
                x.StartDate,
                x.EndDate,
                x.IsCurrent,
-                HasPublishedTimetable = db.SchedulePlans.Any(plan =>
-                    plan.AcademicTermId == x.Id &&
-                    plan.Status == SchedulePlanStatus.Published)
+                 HasPublishedTimetable = db.SchedulePlans.Any(plan =>
+                     plan.AcademicTermId == x.Id &&
+                     plan.Status == SchedulePlanStatus.Published) ||
+                     db.TeachingTasks.Any(task =>
+                         task.AcademicTermId == x.Id &&
+                         task.Status == TeachingTaskStatus.Published &&
+                         task.SchedulingMode == TeachingTaskSchedulingMode.Flexible)
            })
            .ToListAsync(cancellationToken);
        var defaultTermId = terms.FirstOrDefault(x => x.IsCurrent)?.Id
@@ -47,12 +51,17 @@ public sealed class TimetablesController(AppDbContext db) : ControllerBase
                x.Grade,
                MajorName = x.Major!.Name,
                CollegeName = x.Major.College!.Name,
-                HasPublishedTimetable = defaultTermId.HasValue &&
-                    db.ScheduleEntries.Any(entry =>
-                        entry.SchedulePlan!.AcademicTermId == defaultTermId.Value &&
-                        entry.SchedulePlan.Status == SchedulePlanStatus.Published &&
-                        entry.TeachingTask!.Classes.Any(item =>
-                            item.AdministrativeClassId == x.Id))
+                 HasPublishedTimetable = defaultTermId.HasValue &&
+                     (db.ScheduleEntries.Any(entry =>
+                          entry.SchedulePlan!.AcademicTermId == defaultTermId.Value &&
+                          entry.SchedulePlan.Status == SchedulePlanStatus.Published &&
+                          entry.TeachingTask!.Classes.Any(item =>
+                              item.AdministrativeClassId == x.Id)) ||
+                      db.TeachingTasks.Any(task =>
+                          task.AcademicTermId == defaultTermId.Value &&
+                          task.Status == TeachingTaskStatus.Published &&
+                          task.SchedulingMode == TeachingTaskSchedulingMode.Flexible &&
+                          task.Classes.Any(item => item.AdministrativeClassId == x.Id)))
            })
            .ToListAsync(cancellationToken);
        return Ok(new { Terms = terms, Classes = classes });
@@ -148,21 +157,67 @@ public sealed class TimetablesController(AppDbContext db) : ControllerBase
            .Select(x => new { x.Id, x.Name, x.Version, x.PublishedAt })
            .FirstOrDefaultAsync(cancellationToken);

-        var slots = await db.ScheduleTimeSlots.AsNoTracking()
+         var slots = await db.ScheduleTimeSlots.AsNoTracking()
            .Where(x => x.AcademicTermId == term.Id && x.IsEnabled)
            .OrderBy(x => x.PeriodNumber)
-            .Select(x => new { x.PeriodNumber, x.Name, x.StartsAt, x.EndsAt })
+             .Select(x => new { x.PeriodNumber, x.Name, x.StartsAt, x.EndsAt })
+             .ToListAsync(cancellationToken);
+
+        var flexibleTasks = db.TeachingTasks.AsNoTracking()
+            .Where(x =>
+                x.AcademicTermId == term.Id &&
+                x.Status == TeachingTaskStatus.Published &&
+                x.SchedulingMode == TeachingTaskSchedulingMode.Flexible &&
+                x.Classes.Any(item => item.AdministrativeClassId == classId));
+        if (studentId.HasValue)
+        {
+            var selectedFlexibleTaskIds = db.CourseEnrollments.AsNoTracking()
+                .Where(x =>
+                    x.StudentId == studentId.Value &&
+                    x.Status == CourseEnrollmentStatus.Enrolled &&
+                    x.CourseSelectionOffering!.CourseSelectionRound!.AcademicTermId == term.Id)
+                .Select(x => x.CourseSelectionOffering!.TeachingTaskId);
+            flexibleTasks = db.TeachingTasks.AsNoTracking()
+                .Where(x =>
+                    x.AcademicTermId == term.Id &&
+                    x.Status == TeachingTaskStatus.Published &&
+                    x.SchedulingMode == TeachingTaskSchedulingMode.Flexible &&
+                    (x.Classes.Any(item => item.AdministrativeClassId == classId) ||
+                     selectedFlexibleTaskIds.Contains(x.Id)));
+        }
+        var flexibleCourses = await flexibleTasks
+            .OrderBy(x => x.Course!.Code)
+            .ThenBy(x => x.TaskNumber)
+            .Select(x => new
+            {
+                x.Id,
+                x.TaskNumber,
+                x.Name,
+                CourseCode = x.Course!.Code,
+                CourseName = x.Course.Name,
+                x.Course.Credits,
+                x.Course.TotalHours,
+                x.StartWeek,
+                x.EndWeek,
+                x.WeeklyHours,
+                TeacherNames = x.Teachers
+                    .OrderByDescending(item => item.IsPrimary)
+                    .Select(item => item.Teacher!.Name),
+                ClassNames = x.Classes.Select(item => item.AdministrativeClass!.Name),
+                x.Notes
+            })
            .ToListAsync(cancellationToken);

-        if (plan is null)
-            return Ok(new
+         if (plan is null)
+             return Ok(new
            {
                Term = term,
                Class = administrativeClass,
                Student = student,
-                Plan = (object?)null,
-                Slots = slots,
-                Entries = Array.Empty<object>()
+                 Plan = (object?)null,
+                 Slots = slots,
+                 Entries = Array.Empty<object>(),
+                 FlexibleCourses = flexibleCourses
            });

        var entries = db.ScheduleEntries.AsNoTracking()
@@ -223,9 +278,10 @@ public sealed class TimetablesController(AppDbContext db) : ControllerBase
            Term = term,
            Class = administrativeClass,
            Student = student,
-            Plan = plan,
-            Slots = slots,
-            Entries = result
-        });
+             Plan = plan,
+             Slots = slots,
+             Entries = result,
+             FlexibleCourses = flexibleCourses
+         });
    }
 }