zhouj1203@hotmail.com 1 年之前
父節點
當前提交
bd895c6864

+ 2 - 2
TEAMModelOS.SDK/Models/Service/ExamService.cs

@@ -138,13 +138,13 @@ namespace TEAMModelOS.SDK.Models.Service
                         {
                             double totalScore = info.papers.SelectMany(x => x.point).Sum();
                             var classResult = classResults.Where(x => x.examId.Equals(info.id)).ToList();
-                            var classScores = classResult.GroupBy(x => x.info.id).Select(c => new { classId = c.Key, average = c.ToList().Sum(z => z.average) / info.subjects.Count / totalScore }).ToList();
+                            var classScores = classResult.GroupBy(x => x.info.id).Select(c => new { classId = c.Key, average = Math.Round(c.ToList().Sum(z => z.average) / info.subjects.Count / totalScore,2) }).ToList();
                             List<(string className, double average)> classMore = new();
                             foreach (var cs in classScores)
                             {
                                 classMore.Add((cs.classId, cs.average));
                             }
-                            var gradeScores = info.average / totalScore;
+                            var gradeScores = Math.Round(info.average / totalScore,2);
                             List<(string sname, double scores, string classId)> stus = new();
                             foreach (RMember member in rmembers)
                             {

+ 11 - 2
TEAMModelOS/Controllers/Student/OverallEducationController.cs

@@ -601,11 +601,20 @@ namespace TEAMModelOS.Controllers
                         }
                     }
                 }
-               
+                var newExam3Scores = exam3Scores.Select(x => new { 
+                    x.name,
+                    x.gradeScore,
+                    x.classScore,
+                    data = x.xdatas.Select(z => new { 
+                        z.code,
+                        z.name,
+                        z.value
+                    })
+                });
                 #endregion
                 return Ok(new
                 {
-                    exam3Scores,
+                    newExam3Scores,
                     examData,
                     sports_count60,
                     sports_count90,