优化

Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs

@@ -34,5 +34,7 @@ namespace Tiobon.Core.IServices
         Task<ServiceResult<List<StaffTableData>>> QueryRuleStaff(long examId);
 
         Task<ServiceResult<string>> ExportExcel(QueryExport body, string status);
+
+        Task<ServiceResult> ExecuteExamOver();
     }
 }

Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs

@@ -32,7 +32,8 @@ namespace Tiobon.Core.Model.Models
         /// <summary>
         /// TitleID
         /// </summary>
-        public int? GradeID { get; set; }
+        [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false), Display(Name = "表主键")]
+        public int GradeID { get; set; }
         /// <summary>
         /// 编号
         /// </summary>

Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs

@@ -347,6 +347,9 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                 if (examPaper != null)
                     return ServiceResult.OprateFailed($"课程【{entity.CourseName}({entity.CourseNo})】已与试卷【{examPaper.PaperName}({examPaper.PaperName})】关联，暂不可{(status == Consts.DIC_COURSE_STATUS.DRAFT ? "取消发布" : "停用")}");
 
+                if (await Db.Queryable<Ghre_StudyRecord>().AnyAsync(x => x.CourseId == id && x.StudyStatus != Consts.DicStudyRecordStudyStatus.HAS_FINISH && x.CourseEndTime != null && x.CourseEndTime.Value.Date >= DateTime.Now.Date))
+                    return ServiceResult.OprateFailed($"课程【{entity.CourseName}({entity.CourseNo})】有学员正在学习中，暂不可{(status == Consts.DIC_COURSE_STATUS.DRAFT ? "取消发布" : "停用")}");
+
             }
 
             BasePoco ent = entity;

Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs

@@ -1289,7 +1289,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 await Db.Updateable(studyRecords).UpdateColumns(it => new { it.ExamId }).ExecuteCommandAsync();
                 #endregion
 
-                if (entity.DateType == Consts.DicExamDateType.EXAM_DATE)
+                if (entity.DateType == DicExamDateType.EXAM_DATE)
                 {
                     courseEndTime = entity.EndTime.Value.Date.AddDays(1);
                     courseTime = courseEndTime.AddDays(-(snap?.ValidityPeriod ?? 1));
@@ -1370,7 +1370,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
             var exam = await base.QueryById(id);
 
 
-            if (exam.DateType == "ExamDate")
+            if (exam.DateType == DicExamDateType.EXAM_DATE)
             {
                 if (exam.BeginTime > dt)
                     return ServiceResult.OprateFailed("考试尚未开始！");
@@ -1582,4 +1582,18 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
 
         return ServiceResult<List<StaffTableData>>.OprateSuccess("查询成功！", data);
     }
+
+
+    public async Task<ServiceResult> ExecuteExamOver()
+    {
+        var now = Db.GetDate();
+        var exams = await Db.Queryable<Ghre_Exam>().Where(x => 
+        x.DateType == DicExamDateType.EXAM_DATE && 
+        x.Status == DIC_EXAM_STATUS.RELEASED &&
+         x.EndTime !=null&&
+        x.EndTime.Value.Date== now
+        ).ToListAsync();
+
+        return ServiceResult.OprateSuccess("提交成功！");
+    }
 }

Tiobon.Core.Tasks/QuartzNet/Jobs/Job_Blogs_Quartz.cs

@@ -1,21 +1,19 @@
 using Tiobon.Core.IServices;
 using Quartz;
-using System;
-using System.Threading.Tasks;
 
 /// <summary>
 /// 这里要注意下，命名空间和程序集是一样的，不然反射不到
 /// </summary>
-namespace Tiobon.Core.Tasks
+namespace Tiobon.Core.Tasks;
+
+public class Job_Tiobons_Quartz : JobBase, IJob
 { 
-    public class Job_Tiobons_Quartz : JobBase, IJob
-    {
-        private readonly ITiobonArticleServices _TiobonArticleServices;
+    private readonly IGhre_ExamServices _ghre_ExamServices;
 
-        public Job_Tiobons_Quartz(ITiobonArticleServices TiobonArticleServices, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices)
+    public Job_Tiobons_Quartz(IGhre_ExamServices ghre_ExamServices, ITasksQzServices tasksQzServices, ITasksLogServices tasksLogServices)
         : base(tasksQzServices, tasksLogServices)
     {
-            _TiobonArticleServices = TiobonArticleServices;
+        _ghre_ExamServices = ghre_ExamServices;
     }
     public async Task Execute(IJobExecutionContext context)
     {
@@ -23,11 +21,10 @@ namespace Tiobon.Core.Tasks
     }
     public async Task Run(IJobExecutionContext context)
     {
-            System.Console.WriteLine($"Job_Tiobons_Quartz 执行 {DateTime.Now.ToShortTimeString()}");
-            //var list = await _TiobonArticleServices.Query();
+        Console.WriteLine($"Job_Tiobons_Quartz 执行 {DateTime.Now.ToShortTimeString()}");
+        await _ghre_ExamServices.ExecuteExamOver();
         // 也可以通过数据库配置，获取传递过来的参数
         JobDataMap data = context.JobDetail.JobDataMap;
         //int jobId = data.GetInt("JobParam");
     }
-    }
 }