diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs index ea4c9600..edd304fa 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs @@ -28,7 +28,6 @@ public class Ghre_CourseServices : BaseServices totalCount = 0; string sql = @"SELECT * FROM (SELECT A.*, - D.SceneName + ' (' + D.SceneNo + ')' CourseSceneName, E.CourseWareName + ' (' + E.CourseWareNo + ')' CourseWareName, F.StaffName + ' (' + F.StaffNo + ')' ManagerStaffName, G.UserName CreateName, @@ -39,7 +38,6 @@ public class Ghre_CourseServices : BaseServices>(x)).ToList(); }); - data.ForEach(x => - { - if (x.CourseSceneId != null) - courseSceneIds.Add(x.CourseSceneId.Value); - }); + //data.ForEach(x => + //{ + // if (x.CourseSceneId != null) + // courseSceneIds.Add(x.CourseSceneId.Value); + //}); courseSceneIds = courseSceneIds.Distinct().ToList(); var courseScenes = await Db.Queryable().Where(x => courseSceneIds.Contains(x.Id)).ToListAsync(); @@ -188,11 +186,11 @@ public class Ghre_CourseServices : BaseServices a.Id == x.CourseSceneId).ToList(); - x.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")")); - } + //else if (x.CourseSceneId != null) + //{ + // var courseScene = courseScenes.Where(a => a.Id == x.CourseSceneId).ToList(); + // x.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")")); + //} x.BuiltInLabel = x.BuiltIn == 1 ? "是" : "否"; }); diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs index 856211c3..367f3b29 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs @@ -813,7 +813,7 @@ public class Ghre_ExamRecordServices : BaseServices x.Score != null).Sum(x => x.Score); extend.Id = record.Id; extend.CourseName = record.CourseName; extend.CanRetake = true;