diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordCourse.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordCourse.cs index 8d5834fa..38a7ef4c 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordCourse.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordCourse.cs @@ -28,6 +28,7 @@ public class Ghre_StudyRecordCourse public List CourseWareList { get; set; } + public List CourseRemarkSzs { get; set; } public List CourseTeacherList { get; set; } @@ -44,6 +45,13 @@ public class Ghre_StudyRecordCourseWare } + +public class Ghre_StudyRecordCourseCourseRemarkSzs +{ + public string CourseName { get; set; } + public string Outline { get; set; } + +} public class Ghre_StudyRecordCourseTeacher { public long Id { get; set; } @@ -53,5 +61,7 @@ public class Ghre_StudyRecordCourseTeacher public string DeptOrSchoolName { get; set; } public string TeacherRemarkSz { get; set; } + public string CourseName { get; set; } + public string Outline { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs index d78eb7b5..40018ed6 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs @@ -176,6 +176,7 @@ public class Ghre_ExamRecordServices : BaseServices x.Id == examRecordId || x.StudyRecordId == examRecordId); + examRecordId = record.Id; var details = await Db.Queryable().Where(x => x.ExamRecordId == record.Id).ToListAsync(); var detailIds = details.Select(x => x.Id).ToList(); diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index 482353e0..d44e01ab 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -1081,54 +1081,66 @@ public class Ghre_StudyRecordServices : BaseServices(sql); if (course.IsNull()) return ServiceResult.OprateFailed("无效的学习记录ID!"); @@ -1156,6 +1168,15 @@ public class Ghre_StudyRecordServices : BaseServices(sql)); + course.CourseRemarkSzs = course.CourseTeacherList.Select(x => new Ghre_StudyRecordCourseCourseRemarkSzs() + { + CourseName = x.CourseName, + Outline = x.Outline + }).ToList(); + course.TeacherName = string.Join("、", course.CourseTeacherList.Select(x => x.TeacherName)); } } diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index a0db92b3..18325792 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -4845,6 +4845,11 @@ 规则名称 + + + 部门是否含下阶 + + 必选修规则结果 (Dto.Base) @@ -11836,6 +11841,11 @@ 规则名称 + + + 部门是否含下阶 + + 必选修规则结果 (Model)