修复Mysql

2026-07-26 10:19:46 +08:00
parent 634ef69a27
commit 72297aa23f
31 changed files with 1642 additions and 1192 deletions
@@ -82,24 +82,24 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
            {
                x.Id,
                x.TaskNumber,
-                 x.Name,
-                 CourseCode = x.Course!.Code,
-                 CourseName = x.Course!.Name,
-                 CollegeId = x.Course.CollegeId,
-                 CollegeName = x.Course.College!.Name,
-                 TeacherNames = x.Teachers
+                x.Name,
+                CourseCode = x.Course!.Code,
+                CourseName = x.Course!.Name,
+                CollegeId = x.Course.CollegeId,
+                CollegeName = x.Course.College!.Name,
+                TeacherNames = x.Teachers
                    .OrderByDescending(item => item.IsPrimary)
                    .Select(item => item.Teacher!.Name),
-                 x.Capacity,
-                 x.StartWeek,
-                 x.EndWeek,
-                 x.WeeklyHours,
-                 x.SchedulingMode
+                x.Capacity,
+                x.StartWeek,
+                x.EndWeek,
+                x.WeeklyHours,
+                x.SchedulingMode
            })
            .ToListAsync(cancellationToken);
        var taskIds = tasks.Select(x => x.Id).ToList();
        var constraints = await db.TeachingTaskScheduleConstraints.AsNoTracking()
-            .Where(x => taskIds.Contains(x.TeachingTaskId))
+            .WhereIn(taskIds, x => x.TeachingTaskId)
            .Include(x => x.AllowedClassrooms)
            .ToDictionaryAsync(x => x.TeachingTaskId, cancellationToken);
        return Ok(tasks.Select(task =>
@@ -109,19 +109,19 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
            {
                task.Id,
                task.TaskNumber,
-                 task.Name,
-                 task.CourseCode,
-                 task.CourseName,
-                 task.CollegeId,
-                 task.CollegeName,
-                 task.TeacherNames,
-                 task.Capacity,
-                 task.StartWeek,
-                 task.EndWeek,
-                 task.WeeklyHours,
-                 task.SchedulingMode,
-                 HasCustomConstraint = constraint is not null,
-                 RequiresClassroom = task.SchedulingMode == TeachingTaskSchedulingMode.Flexible
+                task.Name,
+                task.CourseCode,
+                task.CourseName,
+                task.CollegeId,
+                task.CollegeName,
+                task.TeacherNames,
+                task.Capacity,
+                task.StartWeek,
+                task.EndWeek,
+                task.WeeklyHours,
+                task.SchedulingMode,
+                HasCustomConstraint = constraint is not null,
+                RequiresClassroom = task.SchedulingMode == TeachingTaskSchedulingMode.Flexible
                     ? false
                     : constraint?.RequiresClassroom ?? true,
                constraint?.RequiredCampusId,
@@ -143,34 +143,34 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
    {
        if (request.AllowedDayOfWeeks.Any(day => day is < 1 or > 7))
            return ValidationProblem("允许上课日必须位于星期一至星期日。");
-         if (request.EarliestPeriod.HasValue &&
-             request.LatestPeriod.HasValue &&
-             request.EarliestPeriod > request.LatestPeriod)
-             return ValidationProblem("最早节次不能晚于最晚节次。");
-         if (!Enum.IsDefined(request.SchedulingMode))
-             return ValidationProblem("授课方式无效。");
-         var task = await db.TeachingTasks
-             .FirstOrDefaultAsync(x => x.Id == teachingTaskId, cancellationToken);
-         if (task is null) return NotFound();
-         if (request.SchedulingMode == TeachingTaskSchedulingMode.Flexible &&
-             await HasScheduleEntriesAsync([teachingTaskId], cancellationToken))
-             return ConflictProblem("该教学任务已有正常排课记录，请先删除排课记录后再改为非排时课程。");
+        if (request.EarliestPeriod.HasValue &&
+            request.LatestPeriod.HasValue &&
+            request.EarliestPeriod > request.LatestPeriod)
+            return ValidationProblem("最早节次不能晚于最晚节次。");
+        if (!Enum.IsDefined(request.SchedulingMode))
+            return ValidationProblem("授课方式无效。");
+        var task = await db.TeachingTasks
+            .FirstOrDefaultAsync(x => x.Id == teachingTaskId, cancellationToken);
+        if (task is null) return NotFound();
+        if (request.SchedulingMode == TeachingTaskSchedulingMode.Flexible &&
+            await HasScheduleEntriesAsync([teachingTaskId], cancellationToken))
+            return ConflictProblem("该教学任务已有正常排课记录，请先删除排课记录后再改为非排时课程。");

-         task.SchedulingMode = request.SchedulingMode;
-         if (request.SchedulingMode == TeachingTaskSchedulingMode.Flexible)
-         {
-             var flexibleConstraint = await db.TeachingTaskScheduleConstraints
-                 .Include(x => x.AllowedClassrooms)
-                 .FirstOrDefaultAsync(x => x.TeachingTaskId == teachingTaskId, cancellationToken);
-             if (flexibleConstraint is not null)
-             {
-                 ClearConstraint(flexibleConstraint);
-             }
-             await db.SaveChangesAsync(cancellationToken);
-             return NoContent();
-         }
+        task.SchedulingMode = request.SchedulingMode;
+        if (request.SchedulingMode == TeachingTaskSchedulingMode.Flexible)
+        {
+            var flexibleConstraint = await db.TeachingTaskScheduleConstraints
+                .Include(x => x.AllowedClassrooms)
+                .FirstOrDefaultAsync(x => x.TeachingTaskId == teachingTaskId, cancellationToken);
+            if (flexibleConstraint is not null)
+            {
+                ClearConstraint(flexibleConstraint);
+            }
+            await db.SaveChangesAsync(cancellationToken);
+            return NoContent();
+        }

-         Building? building = null;
+        Building? building = null;
        if (request.RequiredBuildingId.HasValue)
        {
            building = await db.Buildings.AsNoTracking()
@@ -189,7 +189,8 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
            return ValidationProblem("指定校区不存在或已停用。");

        var allowedRooms = await db.Classrooms.AsNoTracking()
-            .Where(x => request.AllowedClassroomIds.Contains(x.Id) && x.IsEnabled)
+            .Where(x => x.IsEnabled)
+            .WhereIn(request.AllowedClassroomIds, x => x.Id)
            .Include(x => x.Building)
            .ToListAsync(cancellationToken);
        if (allowedRooms.Count != request.AllowedClassroomIds.Distinct().Count())
@@ -225,9 +226,9 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
            ? request.AllowedClassroomIds.Distinct().Select(classroomId =>
                new TeachingTaskAllowedClassroom { ClassroomId = classroomId }).ToList()
            : [];
-         await db.SaveChangesAsync(cancellationToken);
-         return NoContent();
-     }
+        await db.SaveChangesAsync(cancellationToken);
+        return NoContent();
+    }

    [HttpPut("constraints/batch")]
    public async Task<ActionResult> SaveConstraintsBatch(
@@ -246,22 +247,22 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
        if (request.SchedulingMode.HasValue &&
            !Enum.IsDefined(request.SchedulingMode.Value))
            return ValidationProblem("授课方式无效。");
-         if (!request.SchedulingMode.HasValue &&
-             !request.RequiresClassroom.HasValue &&
-             request.AllowedDayOfWeeks is null &&
-             !request.UpdateClassroomScope &&
-             !request.UpdatePeriodRange &&
-             !request.EarliestPeriod.HasValue &&
-             !request.LatestPeriod.HasValue)
+        if (!request.SchedulingMode.HasValue &&
+            !request.RequiresClassroom.HasValue &&
+            request.AllowedDayOfWeeks is null &&
+            !request.UpdateClassroomScope &&
+            !request.UpdatePeriodRange &&
+            !request.EarliestPeriod.HasValue &&
+            !request.LatestPeriod.HasValue)
            return ValidationProblem("请至少选择一项需要批量修改的设置。");
        if (request.UpdateClassroomScope && request.RequiresClassroom == false)
            return ValidationProblem("批量指定教室范围时，场地要求不能设置为不占用教室。");

        var tasks = await db.TeachingTasks
            .Where(x =>
-                taskIds.Contains(x.Id) &&
                x.AcademicTermId == request.AcademicTermId &&
                x.Status == TeachingTaskStatus.Published)
+            .WhereIn(taskIds, x => x.Id)
            .ToListAsync(cancellationToken);
        if (tasks.Count != taskIds.Length)
            return ValidationProblem("部分教学任务不存在、未发布或不属于当前学期。");
@@ -297,7 +298,8 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase

            var roomIds = request.AllowedClassroomIds?.Distinct().ToArray() ?? [];
            allowedRooms = await db.Classrooms.AsNoTracking()
-                .Where(x => roomIds.Contains(x.Id) && x.IsEnabled)
+                .Where(x => x.IsEnabled)
+                .WhereIn(roomIds, x => x.Id)
                .Include(x => x.Building)
                .ToListAsync(cancellationToken);
            if (allowedRooms.Count != roomIds.Length)
@@ -311,12 +313,12 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
                return ValidationProblem("指定教室必须位于所选校区。");
        }

-         var constraints = await db.TeachingTaskScheduleConstraints
-            .Where(x => taskIds.Contains(x.TeachingTaskId))
-            .Include(x => x.AllowedClassrooms)
-             .ToDictionaryAsync(x => x.TeachingTaskId, cancellationToken);
-         foreach (var task in tasks)
-         {
+        var constraints = await db.TeachingTaskScheduleConstraints
+           .WhereIn(taskIds, x => x.TeachingTaskId)
+           .Include(x => x.AllowedClassrooms)
+            .ToDictionaryAsync(x => x.TeachingTaskId, cancellationToken);
+        foreach (var task in tasks)
+        {
            if (request.SchedulingMode.HasValue)
                task.SchedulingMode = request.SchedulingMode.Value;
            if (task.SchedulingMode == TeachingTaskSchedulingMode.Flexible)
@@ -384,7 +386,8 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
        IReadOnlyCollection<Guid> taskIds,
        CancellationToken cancellationToken) =>
        db.ScheduleEntries.AsNoTracking()
-            .AnyAsync(x => taskIds.Contains(x.TeachingTaskId), cancellationToken);
+            .WhereIn(taskIds, x => x.TeachingTaskId)
+            .AnyAsync(cancellationToken);

    private void ClearConstraint(TeachingTaskScheduleConstraint constraint)
    {