biss/Academic-Affairs-System
1
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 13 Wiki Activity

Implement requested workflow and UI updates

Browse Source
This commit is contained in:
biss committed 2026-08-18 10:16:02 +08:00
1 parent 5959585864
commit 390d0b123f
18 files changed
+7800 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Jiaowu.Api/Controllers/ApprovalsController.cs
+16 -30
View File
@@ -439,9 +439,22 @@ public sealed class ApprovalsController(AppDbContext db, ICurrentUserDataScope s
ct);
if (!hasPassedSubstitute)
return ConflictProblem("替代课程必须具有已发布且及格的成绩。");
var applicant = await db.Students.AsNoTracking().Where(x => x.Id == sid.Value)
.Select(x => new { MajorId = x.AdministrativeClass!.MajorId, x.EnrollmentYear })
.FirstAsync(ct);
var rule = await db.CourseEquivalencyRules.AsNoTracking()
.Where(x => x.IsEnabled && x.OriginalCourseId == req.OriginalCourseId &&
x.SubstituteCourseId == req.SubstituteCourseId)
.Where(x => !x.MajorId.HasValue || x.MajorId == applicant.MajorId)
.Where(x => !x.EffectiveGrade.HasValue || x.EffectiveGrade == applicant.EnrollmentYear)
.OrderByDescending(x => x.MajorId.HasValue)
.ThenByDescending(x => x.EffectiveGrade.HasValue)
.FirstOrDefaultAsync(ct);
if (rule is null)
return ConflictProblem("该课程组合未配置适用的等价课程规则，暂不能申请替代。");
if (await db.CourseSubstitutions.AnyAsync(x => x.StudentId == sid && x.OriginalCourseId == req.OriginalCourseId && x.Status == ApprovalStatus.Submitted, ct))
return ConflictProblem("该课程已有替代申请在审核中。");
var cs = new CourseSubstitution { StudentId = sid.Value, OriginalCourseId = req.OriginalCourseId, SubstituteCourseId = req.SubstituteCourseId, Reason = req.Reason.Trim() };
var cs = new CourseSubstitution { StudentId = sid.Value, OriginalCourseId = req.OriginalCourseId, SubstituteCourseId = req.SubstituteCourseId, CourseEquivalencyRuleId = rule.Id, Reason = req.Reason.Trim() };
db.CourseSubstitutions.Add(cs);
await db.SaveChangesAsync(ct);
var info = await db.CourseSubstitutions.Where(x => x.Id == cs.Id)
@@ -458,35 +471,8 @@ public sealed class ApprovalsController(AppDbContext db, ICurrentUserDataScope s
var cs = await db.CourseSubstitutions.Include(x => x.Student).Include(x => x.OriginalCourse).Include(x => x.SubstituteCourse).FirstOrDefaultAsync(x => x.Id == id, ct);
if (cs is null) return NotFound();
cs.Status = ApprovalStatus.Approved; cs.ReviewedAt = DateTime.UtcNow; cs.ReviewedByUserId = scope.Current.UserId;
// Auto-apply: copy passed grade to original course
var currentTerm = await db.AcademicTerms.FirstOrDefaultAsync(x => x.IsCurrent, ct);
if (currentTerm is not null)
{
var passedRecord = await db.GradeRecords
.Where(x => x.StudentId == cs.StudentId && x.GradeSheet!.TeachingTask!.CourseId == cs.SubstituteCourseId && x.TotalScore >= 60)
.OrderByDescending(x => x.GradeSheet!.TeachingTask!.AcademicTerm!.StartDate)
.FirstOrDefaultAsync(ct);
if (passedRecord is not null)
{
// Find or create grade record for original course
var origTask = await db.TeachingTasks.FirstOrDefaultAsync(x => x.CourseId == cs.OriginalCourseId && x.AcademicTermId == currentTerm.Id, ct);
if (origTask is not null)
{
var origSheet = await db.GradeSheets.FirstOrDefaultAsync(x => x.TeachingTaskId == origTask.Id, ct);
if (origSheet is not null)
{
var origRecord = await db.GradeRecords.FirstOrDefaultAsync(x => x.GradeSheetId == origSheet.Id && x.StudentId == cs.StudentId, ct);
if (origRecord is not null)
{
origRecord.TotalScore = passedRecord.TotalScore;
origRecord.GradePoint = passedRecord.GradePoint;
origRecord.Notes =
$"课程替代：{cs.SubstituteCourse!.Code} {cs.SubstituteCourse.Name}";
}
}
}
}
}
// Do not fabricate or edit a grade record. Formal curriculum and
// graduation calculations resolve this approved rule from source data.
await db.SaveChangesAsync(ct);
await NotifyStudent(cs.StudentId, "课程替代申请已通过", $"《{cs.SubstituteCourse!.Name}》替代《{cs.OriginalCourse!.Name}》已生效。", ct);
return NoContent();