From eed35841b1fa7b2d49522b8e5ba01db0096026cc Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Fri, 30 Aug 2024 13:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=80=83=E8=AF=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_CourseServices.cs               |  8 +++---
 .../Ghre/Ghre_ExamRecordServices.cs           |  2 +-
 .../Ghre/Ghre_StudyRecordServices.cs          | 25 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
index c3796ef9..b6dc3318 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
@@ -655,11 +655,13 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
         int? staffId = GetStaffId();
         RefAsync<int> totalCount = 0;
         var dt = DateTime.Now.Date;
-        string sql = @$"SELECT A.Id,
+        string sql = @$"SELECT * FROM (SELECT A.Id,
                                A.CoverUrl,
                                A.PublishTime,
                                A.UseDefaultCoverImage,
                                A.DefaultCoverImageName,
+                               A.CourseSceneId,
+                               A.CourseClassId,
                                A.CourseName + ' (' + A.CourseNo + ')' CourseName,
                                ISNULL (A.StandardHour, 0) StandardHour,
                                ISNULL (A.CreditPoints, 0) CreditPoints,
@@ -686,12 +688,12 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                                    AND C.CourseEndTime >= '{dt}'
                         WHERE     A.IsOpen = 1
                               AND A.IsEnable = 1
-                              AND A.Status = '{DIC_COURSE_STATUS.RELEASED}'";
+                              AND A.Status = '{DIC_COURSE_STATUS.RELEASED}') A";
 
         if (string.IsNullOrWhiteSpace(filter.orderBy))
             filter.orderBy = "CourseName ASC";
 
-        string conditions = " AND 1=1";
+        string conditions = " WHERE 1=1";
         if (filter.jsonParam != null)
             foreach (JProperty jProperty in filter.jsonParam.Properties())
             {
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
index 84a2e104..d78eb7b5 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
@@ -175,7 +175,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
     public async Task<ServiceResult<Ghre_ExamRecordExtend>> ExtendAsync(long examRecordId)
     {
         var extend = new Ghre_ExamRecordExtend();
-        var record = await QuerySingle(x => x.Id == examRecordId);
+        var record = await QuerySingle(x => x.Id == examRecordId || x.StudyRecordId == examRecordId);
 
         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 1945696d..99700bee 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -734,7 +734,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
             label = "课程状态",
             field = "CourseStatus",
             elementType = "ApiSelect",
-            dataSource = "TBParaDetail_Train_CourseIsOpen",
+            dataSource = "TBParaDetail_Train_TrainingCourseStatus",
             editable = true,
             required = false,
             multipleSelect = false,
@@ -836,6 +836,29 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
 
                     continue;
                 }
+
+                if (name == "CourseStatus")
+                {
+                    var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
+                    var dtTime = DateTime.Now;
+                    var value1 = jsonParam.columnValue;
+                    switch (value1)
+                    {
+                        case "In":
+                            conditions += $" AND '{DateTimeHelper.ConvertToSecondString(dtTime)}' BETWEEN CourseBeginTime AND CourseEndTime";
+                            break;
+                        case "Over":
+                            conditions += $" AND CourseEndTime >'{DateTimeHelper.ConvertToSecondString(dtTime)}'";
+                            break;
+                        case "NOStart":
+                            conditions += $" AND CourseBeginTime >'{DateTimeHelper.ConvertToSecondString(dtTime)}'";
+                            break;
+                        default:
+                            break;
+                    }
+                    continue;
+                }
+
                 if (!string.IsNullOrWhiteSpace(value))
                 {
                     var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);