优化

Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs

@@ -611,10 +611,10 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
             exam = await Db.Queryable<Ghre_Exam>()
                      .Where(x => x.Id == studyRecord.ExamId)
                      .FirstAsync(x => x.Status == Consts.DIC_EXAM_STATUS.RELEASED || x.Status == Consts.DIC_EXAM_STATUS.DISABLED);
-
-        if ((isOpenClass == false && exam.IsRequireStudy == true) || (isOpenClass == true && openClass.IsRequireStudy == true))
-            if (studyRecord.StudyProgress.IsNull() || (!studyRecord.StudyProgress.IsNull() && studyRecord.StudyProgress < 100))
-                return ServiceResult<QueryExam>.OprateFailed("学习尚未结束暂不可考试！");
+        if (exam.StudyFinishedRule != DIC_EXAM_STUDY_FINISHED_RULE.NO_STUDY_EXAM_PASS)
+            if ((isOpenClass == false && exam.IsRequireStudy == true) || (isOpenClass == true && openClass.IsRequireStudy == true))
+                if (studyRecord.StudyProgress.IsNull() || (!studyRecord.StudyProgress.IsNull() && studyRecord.StudyProgress < 100))
+                    return ServiceResult<QueryExam>.OprateFailed("学习尚未结束暂不可考试！");
 
         if (exam.IsNull() && (record.Status == DIC_EXAM_RECORD_STATUS.WAIT || record.Status == DIC_EXAM_RECORD_STATUS.EXAMING))
             return ServiceResult<QueryExam>.OprateFailed("该门课程尚未开启考试，请联系HR ！");
@@ -626,7 +626,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
         var dt = Db.GetDate();
         if (exam.DateType == Consts.DicExamDateType.AFTER_HOW_LONG)
         {
-            record.BeginTime = studyRecord?.EndTime;
+            record.BeginTime = studyRecord?.EndTime ?? DateTime.Now;
             if (!record.BeginTime.IsNull())
                 record.EndTime = record.BeginTime.Value.AddDays(exam.AfterHowLong ?? 7);
         }
@@ -926,7 +926,8 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
         var studyRecord = await Db.Queryable<Ghre_StudyRecord>().FirstAsync(x => x.Id == entity.StudyRecordId);
         if (exam.DateType == Consts.DicExamDateType.AFTER_HOW_LONG)
         {
-            entity.BeginTime = studyRecord?.EndTime;
+            entity.BeginTime = studyRecord?.EndTime ?? DateTime.Now;
+
             if (!entity.BeginTime.IsNull())
                 entity.EndTime = entity.BeginTime.Value.AddDays(exam.AfterHowLong ?? 7);
         }