This commit is contained in:
biss committed 2026-08-21 22:02:21 +08:00
1 parent a2ba07a735
commit af88732a07
2 files changed
+7 -4

No files matched your search

@@ -631,8 +631,10 @@ public sealed class EvaluationsController(
{
var teacherId = await CurrentTeacherId(cancellationToken);
if (!teacherId.HasValue) return ConflictProblem("当前账号未关联教师档案。");
return Ok(await PlanSummary(db.TeachingImprovementPlans.AsNoTracking().Where(x => x.TeacherId == teacherId.Value))
.OrderByDescending(x => x.TermStartDate).ToListAsync(cancellationToken));
return Ok(await PlanSummary(db.TeachingImprovementPlans.AsNoTracking()
.Where(x => x.TeacherId == teacherId.Value)
.OrderByDescending(x => x.AcademicTerm!.StartDate))
.ToListAsync(cancellationToken));
}
[HttpPost("closure/plans")]
@@ -676,7 +678,8 @@ public sealed class EvaluationsController(
{
var plans = db.TeachingImprovementPlans.AsNoTracking().Where(x => currentUserDataScope.Current.RestrictedCollegeId == null || x.TeachingTask!.Course!.CollegeId == currentUserDataScope.Current.RestrictedCollegeId);
if (termId.HasValue) plans = plans.Where(x => x.AcademicTermId == termId.Value);
var planRows = await PlanSummary(plans).OrderByDescending(x => x.TermStartDate).ToListAsync(cancellationToken);
var planRows = await PlanSummary(plans.OrderByDescending(x => x.AcademicTerm!.StartDate))
.ToListAsync(cancellationToken);
var observations = db.TeachingObservationEvaluations.AsNoTracking().Where(x => currentUserDataScope.Current.RestrictedCollegeId == null || x.TeachingTask!.Course!.CollegeId == currentUserDataScope.Current.RestrictedCollegeId);
if (termId.HasValue) observations = observations.Where(x => x.AcademicTermId == termId.Value);
var observationStats = await observations.GroupBy(x => x.Source).Select(g => new { Source = g.Key.ToString(), Count = g.Count(), AverageScore = Math.Round(g.Average(x => (double)x.Score), 1) }).ToListAsync(cancellationToken);
@@ -3462,7 +3462,7 @@ public sealed class DevelopmentSqliteMigrator(
"""ALTER TABLE "AcademicCalendarEvents" ADD COLUMN "Source" INTEGER NOT NULL DEFAULT 1;""",
"""ALTER TABLE "AcademicCalendarEvents" ADD COLUMN "SourceYear" INTEGER NULL;""",
"""ALTER TABLE "AcademicCalendarEvents" ADD COLUMN "IsOffDay" INTEGER NULL;""",
"""CREATE INDEX "IX_AcademicCalendarEvents_AcademicTermId_Source_SourceYear_StartsOn" ON "AcademicCalendarEvents" ("AcademicTermId", "Source", "SourceYear", "StartsOn");"""
"""CREATE INDEX IF NOT EXISTS "IX_AcademicCalendarEvents_AcademicTermId_Source_SourceYear_StartsOn" ON "AcademicCalendarEvents" ("AcademicTermId", "Source", "SourceYear", "StartsOn");"""
];
private static readonly string[] CourseEquivalencyRulesAndWaitlistAuditStatements =