diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 683f3f3cd..91ab3ea65 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -862,6 +862,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers TotalScore = x.Select(y => y.Score).Sum(), LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo) }).OrderByDescending(x => x.TotalScore); + var bb = aa.Select(x => x.StuNo).ToList(); + var cc = stuScoreIBLL.GetScoreListByMajor(queryJson).ToList(); var result = new List>(); foreach (var item in aa) { @@ -869,6 +871,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers aaa.Add("StuNo", item.StuNo); aaa.Add("StuName", item.StuName); aaa.Add("TotalScore", item.TotalScore.ToString()); + aaa.Add("OrderClass", (bb.IndexOf(item.StuNo) + 1).ToString()); + aaa.Add("OrderMajor", (cc.IndexOf(item.StuNo) + 1).ToString()); foreach (var lessonInfoItem in item.LessonInfo) { aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat); @@ -892,6 +896,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuNo", ExcelColumn = "学号" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuName", ExcelColumn = "姓名" }); excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "TotalScore", ExcelColumn = "总分" }); + excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "OrderClass", ExcelColumn = "班级排名" }); + excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "OrderMajor", ExcelColumn = "专业排名" }); //课程动态列 var lessonTemp = stuScoreIBLL.GetLessonNoData(queryModel.AcademicYearNo, queryModel.Semester, queryModel.ClassNo).OrderBy(x => x.value);