教学点名:教学班、考勤表均改为服务端分页;支持课程/任务关键词、学期、考勤表名称/备注、状态、签到方式筛选。
成绩管理:确认原本已是服务端分页,且已有学期、状态、课程关键词与学生关键词筛选,无需重复改造。 新增服务端分页与筛选测试。
This commit is contained in:
1 parent
f85a900d82
commit
b08b4cc4df
4 files changed
+245
-17
No files matched your search
@@ -3,6 +3,7 @@ using System.Security.Claims;
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using ClosedXML.Excel;
|
using ClosedXML.Excel;
|
||||||
|
using Jiaowu.Api.Contracts;
|
||||||
using Jiaowu.Api.Domain.Academic;
|
using Jiaowu.Api.Domain.Academic;
|
||||||
using Jiaowu.Api.Domain.Identity;
|
using Jiaowu.Api.Domain.Identity;
|
||||||
using Jiaowu.Api.Infrastructure.Auth;
|
using Jiaowu.Api.Infrastructure.Auth;
|
||||||
@@ -33,14 +34,32 @@ public sealed class AttendanceController(
|
|||||||
[Authorize(Roles = AttendanceRoles)]
|
[Authorize(Roles = AttendanceRoles)]
|
||||||
public async Task<ActionResult> GetMyTasks(
|
public async Task<ActionResult> GetMyTasks(
|
||||||
Guid? academicTermId,
|
Guid? academicTermId,
|
||||||
CancellationToken cancellationToken)
|
string? keyword = null,
|
||||||
|
int page = 1,
|
||||||
|
int pageSize = 20,
|
||||||
|
CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
|
page = Math.Max(1, page);
|
||||||
|
pageSize = Math.Clamp(pageSize, 10, 50);
|
||||||
var tasks = AccessibleTasks().AsNoTracking()
|
var tasks = AccessibleTasks().AsNoTracking()
|
||||||
.Where(x => x.Status == TeachingTaskStatus.Published);
|
.Where(x => x.Status == TeachingTaskStatus.Published);
|
||||||
if (academicTermId.HasValue)
|
if (academicTermId.HasValue)
|
||||||
tasks = tasks.Where(x => x.AcademicTermId == academicTermId);
|
tasks = tasks.Where(x => x.AcademicTermId == academicTermId);
|
||||||
|
if (!string.IsNullOrWhiteSpace(keyword))
|
||||||
|
{
|
||||||
|
keyword = keyword.Trim();
|
||||||
|
tasks = tasks.Where(x =>
|
||||||
|
x.TaskNumber.Contains(keyword) ||
|
||||||
|
x.Name.Contains(keyword) ||
|
||||||
|
x.Course!.Code.Contains(keyword) ||
|
||||||
|
x.Course.Name.Contains(keyword));
|
||||||
|
}
|
||||||
|
var total = await tasks.CountAsync(cancellationToken);
|
||||||
var result = await tasks
|
var result = await tasks
|
||||||
.OrderBy(x => x.Course!.Code)
|
.OrderBy(x => x.Course!.Code)
|
||||||
|
.ThenBy(x => x.TaskNumber)
|
||||||
|
.Skip((page - 1) * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
.Select(x => new
|
.Select(x => new
|
||||||
{
|
{
|
||||||
x.Id,
|
x.Id,
|
||||||
@@ -63,22 +82,44 @@ public sealed class AttendanceController(
|
|||||||
sheet.TeachingTaskId == x.Id)
|
sheet.TeachingTaskId == x.Id)
|
||||||
})
|
})
|
||||||
.ToListAsync(cancellationToken);
|
.ToListAsync(cancellationToken);
|
||||||
return Ok(result);
|
return Ok(new PagedResult<object>(result, total, page, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet("sheets")]
|
[HttpGet("sheets")]
|
||||||
[Authorize(Roles = AttendanceRoles)]
|
[Authorize(Roles = AttendanceRoles)]
|
||||||
public async Task<ActionResult> GetSheets(
|
public async Task<ActionResult> GetSheets(
|
||||||
Guid teachingTaskId,
|
Guid teachingTaskId,
|
||||||
CancellationToken cancellationToken)
|
string? keyword = null,
|
||||||
|
AttendanceSheetStatus? status = null,
|
||||||
|
AttendanceCheckInMethod? checkInMethod = null,
|
||||||
|
int page = 1,
|
||||||
|
int pageSize = 20,
|
||||||
|
CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
|
page = Math.Max(1, page);
|
||||||
|
pageSize = Math.Clamp(pageSize, 10, 50);
|
||||||
var task = await AccessibleTasks().AsNoTracking()
|
var task = await AccessibleTasks().AsNoTracking()
|
||||||
.FirstOrDefaultAsync(x => x.Id == teachingTaskId, cancellationToken);
|
.FirstOrDefaultAsync(x => x.Id == teachingTaskId, cancellationToken);
|
||||||
if (task is null) return NotFound();
|
if (task is null) return NotFound();
|
||||||
|
|
||||||
var sheets = await db.AttendanceSheets.AsNoTracking()
|
var source = db.AttendanceSheets.AsNoTracking()
|
||||||
.Where(x => x.TeachingTaskId == teachingTaskId)
|
.Where(x => x.TeachingTaskId == teachingTaskId);
|
||||||
|
if (!string.IsNullOrWhiteSpace(keyword))
|
||||||
|
{
|
||||||
|
keyword = keyword.Trim();
|
||||||
|
source = source.Where(x => x.Name.Contains(keyword) || x.Notes!.Contains(keyword));
|
||||||
|
}
|
||||||
|
if (status.HasValue)
|
||||||
|
source = source.Where(x => x.Status == status.Value);
|
||||||
|
if (checkInMethod.HasValue)
|
||||||
|
source = source.Where(x => x.CheckInMethod == checkInMethod.Value);
|
||||||
|
|
||||||
|
var total = await source.CountAsync(cancellationToken);
|
||||||
|
var sheets = await source
|
||||||
.OrderByDescending(x => x.AttendanceDate)
|
.OrderByDescending(x => x.AttendanceDate)
|
||||||
|
.ThenByDescending(x => x.Id)
|
||||||
|
.Skip((page - 1) * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
.Select(x => new
|
.Select(x => new
|
||||||
{
|
{
|
||||||
x.Id,
|
x.Id,
|
||||||
@@ -99,7 +140,7 @@ public sealed class AttendanceController(
|
|||||||
TotalCount = x.Records.Count
|
TotalCount = x.Records.Count
|
||||||
})
|
})
|
||||||
.ToListAsync(cancellationToken);
|
.ToListAsync(cancellationToken);
|
||||||
return Ok(sheets);
|
return Ok(new PagedResult<object>(sheets, total, page, pageSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost("sheets")]
|
[HttpPost("sheets")]
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ public sealed class ClickHouseAnalyticsProjectionWorker(
|
|||||||
(x.AttendanceSheetId.CompareTo(cursorSheetId) > 0 ||
|
(x.AttendanceSheetId.CompareTo(cursorSheetId) > 0 ||
|
||||||
x.AttendanceSheetId == cursorSheetId && x.StudentId.CompareTo(cursorStudentId) > 0))
|
x.AttendanceSheetId == cursorSheetId && x.StudentId.CompareTo(cursorStudentId) > 0))
|
||||||
.OrderBy(x => x.AttendanceSheet!.AttendanceDate).ThenBy(x => x.AttendanceSheetId).ThenBy(x => x.StudentId).Take(options.BatchSize)
|
.OrderBy(x => x.AttendanceSheet!.AttendanceDate).ThenBy(x => x.AttendanceSheetId).ThenBy(x => x.StudentId).Take(options.BatchSize)
|
||||||
.Select(x => new { x.AttendanceSheetId, x.StudentId, AttendanceDate = x.AttendanceSheet!.AttendanceDate, TeachingTaskId = x.AttendanceSheet.TeachingTaskId, AcademicTermId = x.AttendanceSheet.TeachingTask!.AcademicTermId, CollegeId = x.AttendanceSheet.TeachingTask.Course!.CollegeId, Status = (byte)x.Status, x.CheckInAt, CheckedInMethod = x.CheckedInMethod == null ? null : (byte?)x.CheckedInMethod, AppealStatus = (byte)x.AppealStatus, ProjectedAt = projectedAt })
|
.Select(x => new { x.AttendanceSheetId, x.StudentId, AttendanceDate = x.AttendanceSheet!.AttendanceDate, TeachingTaskId = x.AttendanceSheet.TeachingTaskId, AcademicTermId = x.AttendanceSheet.TeachingTask!.AcademicTermId, CollegeId = x.AttendanceSheet.TeachingTask.Course!.CollegeId, x.Status, x.CheckInAt, x.CheckedInMethod, x.AppealStatus, ProjectedAt = projectedAt })
|
||||||
.ToListAsync(cancellationToken);
|
.ToListAsync(cancellationToken);
|
||||||
if (rows.Count == 0) return count;
|
if (rows.Count == 0) return count;
|
||||||
await client.InsertAsync("attendanceRecords", rows, cancellationToken);
|
await client.InsertAsync("attendanceRecords", rows, cancellationToken);
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
using Jiaowu.Api.Contracts;
|
||||||
|
using Jiaowu.Api.Controllers;
|
||||||
|
using Jiaowu.Api.Domain.Academic;
|
||||||
|
using Jiaowu.Api.Domain.Identity;
|
||||||
|
using Jiaowu.Api.Infrastructure.Auth;
|
||||||
|
using Jiaowu.Api.Infrastructure.Persistence;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.Data.Sqlite;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace Jiaowu.Api.Tests;
|
||||||
|
|
||||||
|
public sealed class AttendancePaginationTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task TasksAndSheets_AreFilteredAndReturnedByPage()
|
||||||
|
{
|
||||||
|
await using var connection = new SqliteConnection("Data Source=:memory:");
|
||||||
|
await connection.OpenAsync();
|
||||||
|
await using var db = new AppDbContext(
|
||||||
|
new DbContextOptionsBuilder<AppDbContext>().UseSqlite(connection).Options);
|
||||||
|
await db.Database.EnsureCreatedAsync();
|
||||||
|
|
||||||
|
var college = new College { Code = "CS", Name = "计算机学院" };
|
||||||
|
var course = new Course
|
||||||
|
{
|
||||||
|
Code = "CS101", Name = "程序设计基础", CollegeId = college.Id,
|
||||||
|
Credits = 4, TotalHours = 64, LectureHours = 48, PracticeHours = 16,
|
||||||
|
Nature = CourseNature.MajorRequired, AssessmentMethod = AssessmentMethod.Examination
|
||||||
|
};
|
||||||
|
var term = new AcademicTerm
|
||||||
|
{
|
||||||
|
Code = "2026-1", Name = "2026—2027 学年第一学期", AcademicYear = "2026-2027",
|
||||||
|
Season = TermSeason.Autumn, StartDate = new DateOnly(2026, 9, 1),
|
||||||
|
EndDate = new DateOnly(2027, 1, 20)
|
||||||
|
};
|
||||||
|
var tasks = Enumerable.Range(1, 11).Select(number => new TeachingTask
|
||||||
|
{
|
||||||
|
TaskNumber = $"2026-1-CS101-{number:00}", Name = $"程序设计教学班 {number}",
|
||||||
|
AcademicTermId = term.Id, CourseId = course.Id, Capacity = 60,
|
||||||
|
Status = TeachingTaskStatus.Published
|
||||||
|
}).ToList();
|
||||||
|
var sheets = Enumerable.Range(1, 11).Select(number => new AttendanceSheet
|
||||||
|
{
|
||||||
|
TeachingTaskId = tasks[0].Id,
|
||||||
|
Name = number == 11 ? "期末扫码点名" : $"第 {number} 周点名",
|
||||||
|
AttendanceDate = new DateTime(2026, 9, number),
|
||||||
|
Status = number == 11 ? AttendanceSheetStatus.Submitted : AttendanceSheetStatus.Draft,
|
||||||
|
CheckInMethod = number == 11 ? AttendanceCheckInMethod.QrCode : AttendanceCheckInMethod.Manual
|
||||||
|
}).ToList();
|
||||||
|
db.AddRange(college, course, term);
|
||||||
|
db.AddRange(tasks);
|
||||||
|
db.AddRange(sheets);
|
||||||
|
await db.SaveChangesAsync();
|
||||||
|
|
||||||
|
var controller = new AttendanceController(db, new AllScope());
|
||||||
|
var taskResult = Assert.IsType<OkObjectResult>(await controller.GetMyTasks(
|
||||||
|
term.Id, "程序设计", 1, 10, CancellationToken.None));
|
||||||
|
var taskPage = Assert.IsType<PagedResult<object>>(taskResult.Value);
|
||||||
|
Assert.Equal(11, taskPage.Total);
|
||||||
|
Assert.Equal(10, taskPage.Items.Count);
|
||||||
|
|
||||||
|
var sheetResult = Assert.IsType<OkObjectResult>(await controller.GetSheets(
|
||||||
|
tasks[0].Id, "期末", AttendanceSheetStatus.Submitted,
|
||||||
|
AttendanceCheckInMethod.QrCode, 1, 10, CancellationToken.None));
|
||||||
|
var sheetPage = Assert.IsType<PagedResult<object>>(sheetResult.Value);
|
||||||
|
Assert.Equal(1, sheetPage.Total);
|
||||||
|
Assert.Single(sheetPage.Items);
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class AllScope : ICurrentUserDataScope
|
||||||
|
{
|
||||||
|
public CurrentUserScope Current { get; } = new(
|
||||||
|
Guid.NewGuid(), "测试管理员", null, DataScope.All,
|
||||||
|
new HashSet<string>([SystemRoles.SuperAdmin]));
|
||||||
|
}
|
||||||
|
}
|
||||||
Loaded 3 of 4 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user