From 388402a052b1ed8dabd6dc9ff6d5411931fa0e95 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Fri, 13 Sep 2024 11:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=A6=E4=B9=A0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E8=AF=95=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extend/Ghre_StudyRecordCourse.cs          |  10 ++
 .../Ghre/Ghre_ExamRecordServices.cs           |   1 +
 .../Ghre/Ghre_StudyRecordServices.cs          | 125 +++++++++++-------
 Tiobon.Core/Tiobon.Core.Model.xml             |  10 ++
 4 files changed, 97 insertions(+), 49 deletions(-)

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<Ghre_StudyRecordCourseWare> CourseWareList { get; set; }
+    public List<Ghre_StudyRecordCourseCourseRemarkSzs> CourseRemarkSzs { get; set; }
 
 
     public List<Ghre_StudyRecordCourseTeacher> 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<Ghre_ExamRecord, Ghre_ExamRe
     {
         var extend = new Ghre_ExamRecordExtend();
         var record = await QuerySingle(x => x.Id == examRecordId || x.StudyRecordId == examRecordId);
+        examRecordId = record.Id;
 
         var details = await Db.Queryable<Ghre_ExamRecordDetail>().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<Ghre_StudyRecord, Ghre_Stud
         var course = new Ghre_StudyRecordCourse();
 
         string sql = @$"SELECT A.Id,
-                               A.CourseId,
-                               A.CourseSceneId,
-                               ISNULL (B.CourseName, G.SceneName) CourseName,
-                               B.UseDefaultCoverImage,
-                               B.DefaultCoverImageName,
-                               B.CoverUrl,
-                               B.SchoolTeacherId,
-                               B.SchoolId,
-                               B.InOrOut,
-                               E.TeacherName,
-                               --  E.TeacherEName,
-
-
-                               CASE B.InOrOut
-                                  WHEN 'In' THEN C.StaffEname
-                                  WHEN 'Out' THEN NULL
-                                  ELSE NULL
-                               END AS TeacherEName,
-                               E.PhotoUrl TeacherPhotoUrl,
-                               CASE B.InOrOut
-                                  WHEN 'In'
-                                  THEN
-                                     dbo.FO_DeptInfo (E.DeptID,
-                                                      getdate (),
-                                                      1,
-                                                      'DeptFullPateName')
-                                  WHEN 'Out'
-                                  THEN
-                                     F.SchoolName
-                                  ELSE
-                                     NULL
-                               END AS DeptOrSchoolName,
-                               E.SkillPoints TeacherRemarkSz,
-                               B.StandardHour,
-                               B.CreditPoints,
-                               B.Outline CourseRemarkSz,
-                               A.StudyProgress,
-                               A.CourseBeginTime,
-                               A.CourseEndTime,
-                               A.StandardDuration CourseStandardDuration,
-                               A.StudyDuration
-                        FROM Ghre_StudyRecord A
-                             LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
-                             LEFT JOIN Ghra_Staff c ON B.TeacherId = c.StaffID
-                             LEFT JOIN Ghre_Teacher E ON B.SchoolTeacherId = E.Id
-                             LEFT JOIN Ghre_School F ON B.SchoolId = F.Id
-                             LEFT JOIN Ghre_CourseScene G ON A.CourseSceneId = G.Id
-                        WHERE A.Id = '{id}'";
+       A.CourseId,
+       A.CourseSceneId,
+       ISNULL (B.CourseName, G.SceneName)
+          CourseName,
+       ISNULL (B.UseDefaultCoverImage, G.UseDefaultCoverImage)
+          UseDefaultCoverImage,
+       ISNULL (B.DefaultCoverImageName, G.DefaultCoverImageName)
+          DefaultCoverImageName,
+       ISNULL (B.CoverUrl, G.CoverUrl)
+          CoverUrl,
+       B.SchoolTeacherId,
+       B.SchoolId,
+       B.InOrOut,
+       E.TeacherName,
+       --  E.TeacherEName,
+
+
+       CASE B.InOrOut
+          WHEN 'In' THEN C.StaffEname
+          WHEN 'Out' THEN NULL
+          ELSE NULL
+       END
+          AS TeacherEName,
+       E.PhotoUrl
+          TeacherPhotoUrl,
+       CASE B.InOrOut
+          WHEN 'In'
+          THEN
+             dbo.FO_DeptInfo (E.DeptID,
+                              getdate (),
+                              1,
+                              'DeptFullPateName')
+          WHEN 'Out'
+          THEN
+             F.SchoolName
+          ELSE
+             NULL
+       END
+          AS DeptOrSchoolName,
+       E.SkillPoints
+          TeacherRemarkSz,
+       ISNULL (B.StandardHour, G.StandardHour)
+          StandardHour,
+       ISNULL (B.CreditPoints, G.CreditPoints)
+          UseDefaultCoverImage,
+       B.Outline
+          CourseRemarkSz,
+       A.StudyProgress,
+       A.CourseBeginTime,
+       A.CourseEndTime,
+       A.StandardDuration
+          CourseStandardDuration,
+       A.StudyDuration
+FROM Ghre_StudyRecord A
+     LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
+     LEFT JOIN Ghra_Staff c ON B.TeacherId = c.StaffID
+     LEFT JOIN Ghre_Teacher E ON B.SchoolTeacherId = E.Id
+     LEFT JOIN Ghre_School F ON B.SchoolId = F.Id
+     LEFT JOIN Ghre_CourseScene G ON A.CourseSceneId = G.Id
+WHERE A.Id  = '{id}'";
         course = await Db.Ado.SqlQuerySingleAsync<Ghre_StudyRecordCourse>(sql);
         if (course.IsNull())
             return ServiceResult<Ghre_StudyRecordCourse>.OprateFailed("无效的学习记录ID！");
@@ -1156,6 +1168,15 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                     TeacherRemarkSz = course.TeacherRemarkSz
                 }
             ];
+
+            course.CourseRemarkSzs =
+            [
+                new Ghre_StudyRecordCourseCourseRemarkSzs()
+                {
+                    CourseName = course.CourseName,
+                    Outline = course.CourseRemarkSz
+                },
+            ];
         }
         else
         {
@@ -1203,7 +1224,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                                      NULL
                                END AS DeptOrSchoolName,
                                c.SkillPoints TeacherRemarkSz,
-                               a.CourseName
+                               a.CourseName, A.Outline
                         FROM Ghre_Course A
                              LEFT JOIN Ghra_Staff B ON A.TeacherId = B.StaffID
                              LEFT JOIN Ghre_Teacher C ON A.SchoolTeacherId = C.Id
@@ -1211,6 +1232,12 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                         WHERE a.id = '{course1.Id}'";
 
                 course.CourseTeacherList.Add(await Db.Ado.SqlQuerySingleAsync<Ghre_StudyRecordCourseTeacher>(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 @@
             规则名称
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleBase.IsDeptLower">
+            <summary>
+            部门是否含下阶
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleResultBase">
             <summary>
             必选修规则结果 (Dto.Base)
@@ -11836,6 +11841,11 @@
             规则名称
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRule.IsDeptLower">
+            <summary>
+            部门是否含下阶
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleResult">
             <summary>
             必选修规则结果 (Model)