diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 3b8fbf29..7adb58a9 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -17692,7 +17692,7 @@ LABL 0 Arial Unicode MS,8,N Ghre_Exam 1714109077 Administrator -1740033609 +1740034266 Administrator 考试 @@ -18003,16 +18003,16 @@ LABL 0 Arial Unicode MS,8,N bigint -AF165E9F-C5AA-43AD-9682-D6952C7C0007 -否必须学习才能考试 -AfterStudyExam -1740033602 +291BEB9F-9309-4444-9E5F-7C19E70FD9EC +是否需要学习 +IsRequireStudy +1740034256 Administrator -1740033802 +1740034266 Administrator -否必须学习才能考试 +是否需要学习 'true' -bigint +bit 9CD7E08F-5A36-48E1-B0CF-40F5EF1E1F9B diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs index 0f670db5..09050324 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs @@ -28,18 +28,82 @@ public class Ghre_StudyRecordESS public DateTime? CourseBeginDate { get; set; } public DateTime? CourseEndDate { get; set; } public DateTime? ExamDate { get; set; } + + /// + /// 开班状态 + /// + + public string OpenClassStatus { get; set; } + + /// + /// 考试开始时间 + /// public DateTime? ExamBeginDate { get; set; } + + /// + /// 报名开始时间 + /// + public DateTime? RegisterStartTime { get; set; } + + /// + /// 报名结束时间 + /// + public DateTime? RegisterEndTime { get; set; } + + /// + /// 考试结束时间 + /// public DateTime? ExamEndDate { get; set; } + /// + /// 是否显示学习按钮 + /// public bool? ShowStudyBtn { get; set; } = true; + + /// + /// 是否禁用学习按钮 + /// public bool? DisableStudyBtn { get; set; } = false; + + /// + /// 是否显示考试按钮 + /// public bool? ShowExamBtn { get; set; } = true; + + /// + /// 是否禁用考试按钮 + /// public bool? DisableExamBtn { get; set; } = false; + + /// + /// 是否显示反馈按钮 + /// public bool? ShowFeedbackBtn { get; set; } = true; + + /// + /// 是否禁用反馈按钮 + /// public bool? DisableFeedbackBtn { get; set; } = true; + /// + /// 是否显示报名按钮 + /// + public bool? ShowRegisterBtn { get; set; } = false; + + /// + /// 是否禁用报名按钮 + /// + public bool? DisableRegisterBtn { get; set; } = false; + + /// + /// 学习进度 + /// public int? StudyProgress { get; set; } = 0; public int? AfterHowLong { get; set; } + + /// + /// 考试时间类型 + /// public string ExamDateType { get; set; } public string CourseDateString { get; set; } diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index 0c73d183..6f646ed0 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -1107,13 +1107,14 @@ public class Ghre_StudyRecordServices : BaseServices" + (filter.pageNum - 1) * filter.pageSize; var entitys = await Db.Ado.SqlQueryAsync(sql); + + var ids = entitys.Select(x => x.Id).ToList(); + + var openClassStaffs = await Db.Queryable().Where(x => x.OpenClassId != null && ids.Contains(x.OpenClassId.Value) && x.StaffId == staffId).ToListAsync(); + var dt = DateTime.Now.Date; entitys.ForEach(x => { + + x.ShowStudyBtn = false; + x.ShowExamBtn = false; + x.ShowRegisterBtn = false; + + if (dt >= x.RegisterStartTime && dt <= x.RegisterEndTime && x.OpenClassStatus == "Publish" && !openClassStaffs.Any(o => o.OpenClassId == x.Id)) + x.ShowStudyBtn = true; + + + if (x.CourseBeginDate != null && x.CourseEndDate != null) x.CourseDateString = DateTimeHelper.ConvertToDayString(x.CourseBeginDate) + "~" + DateTimeHelper.ConvertToDayString(x.CourseEndDate);