From d394219d9ab1b1abefe79c90d5eb5bd87901ca5a Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 14 May 2025 15:31:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=A6=E4=B9=A0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=A6=E4=B9=A0=E5=8F=AF=E5=AD=A6=E5=8F=AF=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs | 1 +
 Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs      | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
index ea0f2f3e..e8c45839 100644
--- a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
@@ -118,5 +118,6 @@ public class Ghre_StudyRecordESS
     public long? FeedbackOrderId { get; set; }
 
     public bool? IsRequireStudy { get; set; } = true;
+    public string StudyFinishedRule { get; set; }
 
 }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index ac7de56f..210e813b 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -920,7 +920,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                                A.ExamDateType,
                                A.AfterHowLong,
                                A.StudyProgress,
-                               A.ExamId,A.ExamStatus,A.CoursePublishTime,A.IsRequireStudy,A.CompleteStatus
+                               A.ExamId,A.ExamStatus,A.CoursePublishTime,A.IsRequireStudy,A.CompleteStatus,A.StudyFinishedRule
                         FROM Ghre_StudyRecord_V A";
 
             string conditions = $" WHERE UserId={App.User.ID} ";
@@ -1061,6 +1061,9 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                 if (x.ExamId.IsNotEmptyOrNull() && (x.ExamBeginDate > dt || dt > x.ExamEndDate))
                     x.DisableExamBtn = true;
 
+                if (x.StudyFinishedRule == DIC_EXAM_STUDY_FINISHED_RULE.NO_STUDY_EXAM_PASS)
+                    x.DisableExamBtn = false;
+
                 if (x.FeedbackOrderId.IsNull())
                     x.ShowFeedbackBtn = false;