From 05ba7d873b5f70d1623accb0099c747d879df942 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 29 Apr 2025 16:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=9C=A8=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF=E8=BE=BE=E5=88=B0=E6=80=BB=E6=95=B0=E6=97=B6?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=AE=9E=E6=97=B6=E5=88=A4=E5=AE=9A=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=20=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E7=BB=93=E6=9D=9F=E6=97=B6=E9=9C=80=E8=A6=81=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E5=88=A4=E5=AE=9A=E5=AD=A6=E4=B9=A0=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E6=AF=8F=E5=A4=A9=E6=99=9A=E4=B8=8A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E5=AD=A6=E4=B9=A0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E2=80=9C=E5=B7=B2=E5=AE=8C=E6=88=90=E2=80=9D=E7=9A=84?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Extend/Ghre_StudyRecordESS.cs  |  5 ++-
 .../Ghre/Ghre_StudyRecordServices.cs          |  4 +--
 Tiobon.Core/Tiobon.Core.Model.xml             | 35 +++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
index 54ade0ff..ea0f2f3e 100644
--- a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
@@ -1,4 +1,6 @@
-namespace Tiobon.Core.Model;
+using static Tiobon.Core.Model.Consts;
+
+namespace Tiobon.Core.Model;
 
 public class Ghre_StudyRecordESS
 {
@@ -109,6 +111,7 @@ public class Ghre_StudyRecordESS
 
     public string ExamDateString { get; set; }
     public string ExamStatus { get; set; }
+    public string CompleteStatus { get; set; } = DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.NO_FINISH;
 
     public long? ExamId { get; set; }
 
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 98e01d9e..c60b0730 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -846,7 +846,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
         entity.SearchFields.Add(new CoursePublicSearchField()
         {
             label = "学习状态",
-            field = "StudyStatus",
+            field = "CompleteStatus",
             elementType = "ApiSelect",
             dataSource = "TBParaDetail_Train_TrainingStudyStatus",
             editable = true,
@@ -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.ExamId,A.ExamStatus,A.CoursePublishTime,A.IsRequireStudy,A.CompleteStatus
                         FROM Ghre_StudyRecord_V A";
 
             string conditions = $" WHERE UserId={App.User.ID} ";
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 0bdd0484..fce35185 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -39568,6 +39568,26 @@
             手动选修
             </summary>
         </member>
+        <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE">
+            <summary>
+            考试管理-学习完成标准
+            </summary>
+        </member>
+        <member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.EXAM_PASS">
+            <summary>
+            学习完成+考试合格
+            </summary>
+        </member>
+        <member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.STUDY_FINISHED">
+            <summary>
+            学习完成
+            </summary>
+        </member>
+        <member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.NO_STUDY_EXAM_PASS">
+            <summary>
+            不学习但考试合格
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Consts.DIC_TRAINING_STUDY_RULE_TRAIN_TYPE">
             <summary>
             培训规则种类
@@ -39643,6 +39663,21 @@
             已完成
             </summary>
         </member>
+        <member name="T:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS">
+            <summary>
+            培训记录-学习状态
+            </summary>
+        </member>
+        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.FINISHED">
+            <summary>
+            已完成
+            </summary>
+        </member>
+        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.NO_FINISH">
+            <summary>
+            未完成
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS">
             <summary>
             考试记录-状态