考试管理发布 优化学习记录时间

Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs

@@ -736,7 +736,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 x.canPreview = 0;
             }
 
-            if (x.DateType == "ExamDate")
+            if (x.DateType == Consts.DicExamDateType.EXAM_DATE)
                 x.AfterHowLongLabel = x.BeginTime.Value.ToString("yyyy-MM-dd") + " ~ " + x.EndTime.Value.ToString("yyyy-MM-dd");
             else
                 x.AfterHowLongLabel = $"学完{x.AfterHowLong}天";
@@ -1006,8 +1006,8 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 pageData.AfterHowLong1 = pageData.AfterHowLong;
                 pageData.AfterHowLong = 0;
             }
-            if (pageData.DateType == "ExamDate") pageData.ExamDate.Add(pageData.BeginTime.Value.ToString("yyyy/MM/dd"));
-            if (pageData.DateType == "ExamDate") pageData.ExamDate.Add(pageData.EndTime.Value.ToString("yyyy/MM/dd"));
+            if (pageData.DateType == Consts.DicExamDateType.EXAM_DATE) pageData.ExamDate.Add(pageData.BeginTime.Value.ToString("yyyy/MM/dd"));
+            if (pageData.DateType == Consts.DicExamDateType.EXAM_DATE) pageData.ExamDate.Add(pageData.EndTime.Value.ToString("yyyy/MM/dd"));
             input.pageData = pageData;
 
             //var staffs = await _ghre_ExamStaffServices.Query(x => x.ExamId == Id);
@@ -1091,7 +1091,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
 
     public async Task<ServiceResult<long>> Insert1(long id, DefaultGhre_ExamPageData pageData)
     {
-        if (pageData.DateType == "ExamDate")
+        if (pageData.DateType == Consts.DicExamDateType.EXAM_DATE)
         {
             pageData.BeginTime = Convert.ToDateTime(pageData.ExamDate[0]);
             pageData.EndTime = Convert.ToDateTime(pageData.ExamDate[1]);
@@ -1281,7 +1281,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 var courseEndTime = courseTime.Date.AddMonths(snap?.ValidityPeriod ?? 1);
 
                 #region 自动给学习记录匹配考试ID
-                                var studyRecords = await Db.Queryable<Ghre_StudyRecord>()
+                var studyRecords = await Db.Queryable<Ghre_StudyRecord>()
                     .WhereIF(!entity.CourseId.IsNull(), x => x.CourseId == entity.CourseId)
                     .WhereIF(!entity.CourseSceneId.IsNull(), x => x.CourseSceneId == entity.CourseSceneId)
                     .Where(x => x.ExamId == null).ToListAsync();
@@ -1289,6 +1289,12 @@ 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)
+                {
+                    courseEndTime = entity.EndTime.Value.Date.AddDays(1);
+                    courseTime = courseEndTime.AddDays(-(snap?.ValidityPeriod ?? 1));
+                }
+
                 for (int i = 0; i < staffs.Count; i++)
                 {
                     var staff = staffs[i];