From 5cd07de34e4cd0492e171298a08e32527faa72ec Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Tue, 25 Feb 2025 14:42:14 +0800 Subject: [PATCH] =?UTF-8?q?ESS=E5=BC=80=E7=8F=AD=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index d5a8cfaf..fa5c1475 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -1123,7 +1123,7 @@ FROM Ghre_OpenClass A JOIN Ghre_StaffGroup B ON A.StaffGroupId = B.Id LEFT JOIN Ghre_Course C ON A.LinkId = C.Id LEFT JOIN Ghre_CourseScene D ON A.LinkId = D.Id - LEFT JOIN Ghre_Exam E ON A.ExamId = E.Id + LEFT JOIN Ghre_ExamRecord E ON A.ExamId = E.ExamId AND E.StaffId = '{staffId}' LEFT JOIN Ghre_StudyRecord F ON A.Id = F.OpenClassId WHERE A.Status !='Temporary' AND EXISTS ( SELECT 1 @@ -1330,7 +1330,8 @@ WHERE A.Status !='Temporary' AND EXISTS ( //if (x.CourseBeginDate != null && x.CourseEndDate != null) // if (x.StudyProgress >= 100 || !(x.CourseBeginDate.Value.Date <= DateTime.Now.Date && x.CourseEndDate.Value.Date >= DateTime.Now.Date)) // x.DisableStudyBtn = true; - + if(!x.ExamId.IsNull()) + x.ShowExamBtn = true; if (x.StudyProgress < 100 || x.ExamId.IsNull()) x.DisableExamBtn = true; if (x.FeedbackOrderId.IsNull())