修复Mysql

2026-07-26 10:19:46 +08:00
parent 634ef69a27
commit 72297aa23f
31 changed files with 1642 additions and 1192 deletions
@@ -164,7 +164,7 @@ public sealed class MakeupExamArrangementService(AppDbContext db)
            .ToHashSet();

        if (occupiedRoomIds.Count > 0)
-            query = query.Where(x => !occupiedRoomIds.Contains(x.Id));
+            query = query.WhereNotIn(occupiedRoomIds, x => x.Id);

        var dbOccupiedRooms = await db.MakeupExamSessions.AsNoTracking()
            .Where(x => x.MakeupExamPlanId == session.MakeupExamPlanId &&
@@ -176,7 +176,7 @@ public sealed class MakeupExamArrangementService(AppDbContext db)
            .ToListAsync(cancellationToken);

        if (dbOccupiedRooms.Count > 0)
-            query = query.Where(x => !dbOccupiedRooms.Contains(x.Id));
+            query = query.WhereNotIn(dbOccupiedRooms, x => x.Id);

        return await query
            .OrderBy(x => x.Capacity)
@@ -208,8 +208,8 @@ public sealed class MakeupExamArrangementService(AppDbContext db)
        foreach (var id in excludeTeacherIds) busyTeacherIds.Add(id);

        return await db.Teachers.AsNoTracking()
-            .Where(x => x.Status == TeacherStatus.Active &&
-                        !busyTeacherIds.Contains(x.Id))
+            .Where(x => x.Status == TeacherStatus.Active)
+            .WhereNotIn(busyTeacherIds, x => x.Id)
            .OrderBy(x => Guid.NewGuid())
            .Take(needed)
            .ToListAsync(cancellationToken);