YD/YD_SmartSports.Api
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

班级筛选

Browse Source
This commit is contained in:
tanglong 2026-01-26 16:58:17 +08:00
parent e6f5ef8932
commit cf887be6de
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
VOL.Business/Services/Training/I_TrainingDataService.cs
View File

@ -2013,6 +2013,8 @@ namespace VOL.Business.Services.Training
{
Id = td.Id,
ClassId = td.ClassId,
GradeName = td.GradeName,
ClassName = td.ClassName,
GradeAndClass = $"{td.GradeName}-{td.ClassName}",
TeacherName = td.TeacherName,
StartingEndingTime = $"{(td.StartTime.HasValue ? td.StartTime.Value.ToString("yyyy-MM-dd HH:mm") : string.Empty)}{(td.EndTime.HasValue ? " - " + td.EndTime.Value.ToString("yyyy-MM-dd HH:mm") : string.Empty)}"
@ -2028,6 +2030,16 @@ namespace VOL.Business.Services.Training
query = query.Where(x => x.TeacherName.Contains(paramDto.TeacherName ?? ""));
}
if (!paramDto.GradeName.IsNullOrEmpty())
{
query = query.Where(x => x.GradeName.Contains(paramDto.GradeName ?? ""));
}
if (!paramDto.ClassName.IsNullOrEmpty())
{
query = query.Where(x => x.ClassName.Contains(paramDto.ClassName ?? ""));
}
res.Total = await query.CountAsync();
var list = await query
@ -2050,7 +2062,7 @@ namespace VOL.Business.Services.Training
var res = new GetClassReportDetailsModel();
var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>()
where hrd.ClassRoomRecordId == id
where hrd.ClassRoomRecordId == id
select hrd;
var heartRateDataList = await query.ToListAsync();
@ -2063,7 +2075,7 @@ namespace VOL.Business.Services.Training
.FirstAsync();
var classRoomStudent = await _teacherRepository.DbContext.Set<Ai_ClassroomStudentRecord>()
.Where(x => x.ClassRoomRecordId == id)
.Where(x => x.ClassRoomRecordId == id)
.ToListAsync();
res.GradeAndClass = $"{classRoom.GradeName}-{classRoom.ClassName}";
@ -2133,7 +2145,7 @@ namespace VOL.Business.Services.Training
//var schoolCode = UserContext.Current.TenantId;
var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>()
where hrd.ClassRoomRecordId == paramDto.ClassRoomRecordId &&
where hrd.ClassRoomRecordId == paramDto.ClassRoomRecordId &&
hrd.StudentNo == paramDto.StudentNo
select hrd;
@ -2155,7 +2167,7 @@ namespace VOL.Business.Services.Training
res.Consumption = Math.Abs((int)heartRateDataList.Average(x => x.Consumption ?? 0));
//var baseTime = heartRateDataList.Min(x => x.ScoreTime);
var baseTime = await _teacherRepository.DbContext.Set<Ai_HeartRateData>().Where(x =>x.ClassRoomRecordId == paramDto.ClassRoomRecordId).MinAsync(x => x.ScoreTime);
var baseTime = await _teacherRepository.DbContext.Set<Ai_HeartRateData>().Where(x => x.ClassRoomRecordId == paramDto.ClassRoomRecordId).MinAsync(x => x.ScoreTime);
var heartRateWithMinutes = heartRateDataList
.Select(data => new

10
VOL.Model/Training/Request/ClassReportListParam.cs
View File

@ -26,6 +26,16 @@ namespace VOL.Model
/// </summary>
public int? ClassId { get; set; }
/// <summary>
/// 年级名称
/// </summary>
public string? GradeName { get; set; }
/// <summary>
/// 班级名称
/// </summary>
public string? ClassName { get; set; }
/// <summary>
/// 教师名
/// </summary>

10
VOL.Model/Training/Response/ClassReportModel.cs
View File

@ -22,6 +22,16 @@ namespace VOL.Model
/// </summary>
public int? ClassId { get; set; }
/// <summary>
/// 年级名称
/// </summary>
public string GradeName { get; set; }
/// <summary>
/// 班级名称
/// </summary>
public string ClassName { get; set; }
/// <summary>
/// 年级-班级
/// </summary>