小人的进度需要综合学习、考试、反馈显示

Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs

@@ -211,7 +211,7 @@ namespace Tiobon.Core.Services
                                A.ExamDateType,
                                A.AfterHowLong,
                                A.StudyProgress,
-                               A.ExamId
+                               A.ExamId,A.ExamStatus
                         FROM Ghre_StudyRecord_V A";
 
             string conditions = $" WHERE UserId={App.User.ID} ";
@@ -330,9 +330,13 @@ namespace Tiobon.Core.Services
                     x.ShowFeedbackBtn = false;
 
                 #region 处理学习进度
+
+                if(x.ExamId.IsNull())
+                    x.ShowExamBtn = false;
+
                 if (!x.ExamId.IsNull() && x.FeedbackOrderId.IsNull())
                 {
-                    if (x.ExamStatus == DIC_EXAM_RECORD_STATUS.WAIT)
+                    if (x.ExamStatus == DIC_EXAM_RECORD_STATUS.WAIT || x.ExamStatus.IsNull())
                         x.StudyProgress = x.StudyProgress / 2;
                     else if (x.ExamStatus == DIC_EXAM_RECORD_STATUS.EXAMING)
                         x.StudyProgress = 75;