diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs index 185da9acd..04ff4e869 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoGraduateController.cs @@ -42,12 +42,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } [HttpGet] - public ActionResult PrintScore(string keyValue) + public ActionResult PrintScore() + { + return View(); + } + + [HttpGet] + [AjaxOnly] + public ActionResult DataFilling(string keyValue) { //毕业表 var StuInfoGraduateEntity = stuInfoGraduateIBLL.GetEntity(keyValue); - - if (StuInfoGraduateEntity == null) { return View(new StuInfoGraduateEntity()); @@ -60,6 +65,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { AcademicYearNo = x.Key.AcademicYearNo, Semester = x.Key.Semester, + StuScoreList = x.Select(y => new StuScoreEntity() { LessonNo = y.LessonNo, @@ -74,15 +80,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers Crowning = StuInfoGraduateEntity.Crowning, EduSystem = StuInfoGraduateEntity.EduSystem, Grade = StuInfoGraduateEntity.Grade, - ClassName = StuInfoGraduateEntity.ClassName, - MajorName = StuInfoGraduateEntity.MajorName, + ClassName = StuInfoGraduateEntity.StuScoreList.FirstOrDefault().ClassName, + MajorName = StuInfoGraduateEntity.StuScoreList.FirstOrDefault().MajorName, StuInfoGraduateEntity = StuInfoGraduateEntity, - Counts = Score.Count(), + Counts = Score.Count().ToString(), }; - - return View(result); + return Success(result); } - #endregion #region 获取数据