This commit is contained in:
tanglong 2026-01-16 11:46:18 +08:00
parent d403eaf4e6
commit c837d4d9a4

View File

@ -2039,8 +2039,7 @@ namespace VOL.Business.Services.Training
var res = new GetClassReportDetailsModel(); var res = new GetClassReportDetailsModel();
var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>() var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>()
//where hrd.SchoolCode.Equals(UserContext.Current.TenantId) && hrd.ClassRoomRecordId.Equals(id) && hrd.Strength > 0 where hrd.ClassRoomRecordId == id
where hrd.SchoolCode.Equals(UserContext.Current.TenantId) && hrd.ClassRoomRecordId == id
select hrd; select hrd;
var heartRateDataList = await query.ToListAsync(); var heartRateDataList = await query.ToListAsync();
@ -2049,11 +2048,11 @@ namespace VOL.Business.Services.Training
return res; return res;
var classRoom = await _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>().Include(x => x.ClassroomStudentRecord) var classRoom = await _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>().Include(x => x.ClassroomStudentRecord)
.Where(x => x.SchoolCode == UserContext.Current.TenantId && x.Id == id) .Where(x => x.Id == id)
.FirstAsync(); .FirstAsync();
var classRoomStudent = await _teacherRepository.DbContext.Set<Ai_ClassroomStudentRecord>() var classRoomStudent = await _teacherRepository.DbContext.Set<Ai_ClassroomStudentRecord>()
.Where(x => x.SchoolCode == UserContext.Current.TenantId && x.ClassRoomRecordId == id) .Where(x => x.ClassRoomRecordId == id)
.ToListAsync(); .ToListAsync();
res.GradeAndClass = $"{classRoom.GradeName}-{classRoom.ClassName}"; res.GradeAndClass = $"{classRoom.GradeName}-{classRoom.ClassName}";
@ -2120,11 +2119,10 @@ namespace VOL.Business.Services.Training
{ {
var res = new GetStudentClassReportDetailsModel(); var res = new GetStudentClassReportDetailsModel();
var schoolCode = UserContext.Current.TenantId; //var schoolCode = UserContext.Current.TenantId;
var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>() var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>()
where hrd.SchoolCode == schoolCode && where hrd.ClassRoomRecordId == paramDto.ClassRoomRecordId &&
hrd.ClassRoomRecordId == paramDto.ClassRoomRecordId &&
hrd.StudentNo == paramDto.StudentNo hrd.StudentNo == paramDto.StudentNo
select hrd; select hrd;
@ -2146,7 +2144,7 @@ namespace VOL.Business.Services.Training
res.Consumption = Math.Abs((int)heartRateDataList.Average(x => x.Consumption ?? 0)); res.Consumption = Math.Abs((int)heartRateDataList.Average(x => x.Consumption ?? 0));
//var baseTime = heartRateDataList.Min(x => x.ScoreTime); //var baseTime = heartRateDataList.Min(x => x.ScoreTime);
var baseTime = await _teacherRepository.DbContext.Set<Ai_HeartRateData>().Where(x => x.SchoolCode == schoolCode && 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 var heartRateWithMinutes = heartRateDataList
.Select(data => new .Select(data => new