From e650df7a037fd35e8d7b33a06c1dfd93e95874de Mon Sep 17 00:00:00 2001
From: tanglong <842690096@qq.com>
Date: Wed, 11 Jun 2025 16:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChatApplet/Services/Impl/TeacherService.cs  | 33 ++++++++++++-------
 .../ClassRoomRecord/ClassReportDetailsDto.cs  |  2 ++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/WeChatApplet/Services/Impl/TeacherService.cs b/WeChatApplet/Services/Impl/TeacherService.cs
index 6832ed0..7a6f5fa 100644
--- a/WeChatApplet/Services/Impl/TeacherService.cs
+++ b/WeChatApplet/Services/Impl/TeacherService.cs
@@ -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);
diff --git a/YD_WeChatApplet.Commons/Dto/ClassRoomRecord/ClassReportDetailsDto.cs b/YD_WeChatApplet.Commons/Dto/ClassRoomRecord/ClassReportDetailsDto.cs
index 3ad5298..c046587 100644
--- a/YD_WeChatApplet.Commons/Dto/ClassRoomRecord/ClassReportDetailsDto.cs
+++ b/YD_WeChatApplet.Commons/Dto/ClassRoomRecord/ClassReportDetailsDto.cs
@@ -66,5 +66,7 @@ namespace YD_WeChatApplet.Commons.Dto.ClassRoomRecord
         ///年龄
         /// </summary>
         public int Age { get; set; }
+
+        public string Photo { get; set; }
     }
 }