Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs

@@ -60,17 +60,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             var Score = stuScoreIBLL.GetScoreListStuNo(StuInfoGraduateEntity.StuNo);
             //学习成绩
             StuInfoGraduateEntity.StuScoreList = Score.Where(x => x.AcademicYearNo != null && x.Semester != null && x.Score != null)
-                .GroupBy(x => new { x.AcademicYearNo, x.Semester })
+                .GroupBy(x => new { x.AcademicYearNo, x.Semester,x.MajorName,x.ClassName })
                 .Select(x => new StuScores()
                 {
                     AcademicYearNo = x.Key.AcademicYearNo,
                     Semester = x.Key.Semester,
-
+                    MajorName = x.Key.MajorName,
+                    ClassName = x.Key.ClassName,
+                    
                     StuScoreList = x.Select(y => new StuScoreEntity()
                     {
                         LessonNo = y.LessonNo,
                         LessonName = y.LessonName,
-                        Score = y.Score
+                        Score = y.Score,
+                        ClassName = y.ClassName,
+                        MajorName=y.MajorName
                     }).OrderBy(xx => xx.LessonNo).ToList()
                 }).OrderBy(xx => xx.AcademicYearNo).ThenBy(xx => xx.Semester).ToList();
             var result = new

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs

@@ -837,6 +837,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             public string AcademicYearNo { get; set; }
             public string Semester { get; set; }
+            [NotMapped] public string MajorName { get; set; }
+            [NotMapped] public string ClassName { get; set; }
             public List<StuScoreEntity> StuScoreList { get; set; }
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs

@@ -460,7 +460,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public string MoveType { get; set; }
 
-
     }
 }