From 7ef05ac7fd17ecfcb5cb167d8872fe300b80ddf5 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 24 Apr 2025 10:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=80=83=E8=AF=95=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E8=AE=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_CourseServices.cs               | 22 +++++++++----------
 .../Ghre/Ghre_ExamRecordServices.cs           |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

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<Ghre_Course, Ghre_CourseDto, Ins
         RefAsync<int> 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<Ghre_Course, Ghre_CourseDto, Ins
                                      END TeacherName,
                                      ISNULL (A.UpdateTime, A.CreateTime) CreateTime1
                               FROM Ghre_Course A
-                                   LEFT JOIN Ghre_CourseScene D ON A.CourseSceneId = D.Id
                                    LEFT JOIN Ghre_CourseWare E ON A.CourseWareId = E.Id
                                    LEFT JOIN Ghra_Staff F ON A.ManagerId = F.StaffID
                                    LEFT JOIN Ghrs_User G ON A.CreateBy = G.UserId
@@ -161,11 +159,11 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                 courseSceneIds = courseSceneIds.Concat(JsonConvert.DeserializeObject<List<long>>(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<Ghre_CourseScene>().Where(x => courseSceneIds.Contains(x.Id)).ToListAsync();
 
@@ -188,11 +186,11 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                 }
             }
 
-            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 + ")"));
-            }
+            //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<Ghre_ExamRecord, Ghre_ExamRe
             extend.ExamEndDate = DateTimeHelper.ConvertToDayString(record.EndTime);
         }
         extend.ExamStatus = record.Status;
-        extend.TotalScore = record.TotalScore;
+        extend.TotalScore = details.Where(x => x.Score != null).Sum(x => x.Score);
         extend.Id = record.Id;
         extend.CourseName = record.CourseName;
         extend.CanRetake = true;