学生头像
This commit is contained in:
parent
c3a734e966
commit
e650df7a03
@ -413,23 +413,34 @@ namespace YD_WeChatApplet.Services
|
||||
var studentTrainingRecordList = classRoom.ClassroomStudentRecord.ToList();
|
||||
List<StudentTrainingRecordDto> studentList = new List<StudentTrainingRecordDto>();
|
||||
|
||||
var studentIds = studentTrainingRecordList.Select(x => x.StudentNo).ToList();
|
||||
|
||||
var students = await _sportsContext.Student.Where(x => studentIds.Contains(x.StudentNo)).Select(x => new
|
||||
{
|
||||
x.StudentNo,
|
||||
x.StudentName,
|
||||
x.Age,
|
||||
x.Sex,
|
||||
x.Photo
|
||||
}).ToListAsync();
|
||||
|
||||
foreach (var item in studentTrainingRecordList)
|
||||
{
|
||||
var studentTrainingData = heartRateDataList.Where(x => x.StudentNo == item.StudentNo).ToList();
|
||||
//var studentTrainingData = heartRateDataList.Where(x => x.StudentNo == item.StudentNo).ToList();
|
||||
|
||||
if (studentTrainingData.Count > 0)
|
||||
var stu = students.FirstOrDefault(x => x.StudentNo == item.StudentNo);
|
||||
|
||||
var student = new StudentTrainingRecordDto()
|
||||
{
|
||||
var student = new StudentTrainingRecordDto()
|
||||
{
|
||||
StudentNo = item.StudentNo,
|
||||
Age = item.Age,
|
||||
Sex = item.Sex
|
||||
};
|
||||
StudentNo = stu?.StudentNo,
|
||||
Age = stu?.Age ?? item.Age,
|
||||
Sex = stu?.Sex ?? item.Sex
|
||||
};
|
||||
|
||||
student.StudentName = studentTrainingData[0].StudentName;
|
||||
student.StudentName = stu?.StudentName;
|
||||
student.Photo = stu?.Photo ?? "";
|
||||
|
||||
studentList.Add(student);
|
||||
}
|
||||
studentList.Add(student);
|
||||
}
|
||||
|
||||
res.HeartRateTrend = GetHeartRateTrend(heartRateDataList);
|
||||
|
@ -66,5 +66,7 @@ namespace YD_WeChatApplet.Commons.Dto.ClassRoomRecord
|
||||
///年龄
|
||||
/// </summary>
|
||||
public int Age { get; set; }
|
||||
|
||||
public string Photo { get; set; }
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user