diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs index 02954f117..649203288 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs @@ -175,7 +175,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { if (list.Count <= 0) { - return Fail("请安排时间"); + return Fail("请安排时间!"); } foreach (var entity in list) @@ -183,12 +183,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers DateTime time; if (!DateTime.TryParse(entity.ExamTimeStart, out time)) { - return Fail("结束时间格式不正确!"); + return Fail("开始时间格式不正确!"); } if (!DateTime.TryParse(entity.ExamTimeEnd, out time)) { return Fail("结束时间格式不正确!"); } + + var startTime = Convert.ToDateTime(entity.ExamDate.Value.ToString("yyyy-MM-dd") + " " + entity.ExamTimeStart); + var endTime = Convert.ToDateTime(entity.ExamDate.Value.ToString("yyyy-MM-dd") + " " + entity.ExamTimeEnd); + if (endTime <= startTime) + { + return Fail("结束时间必须大于开始时间!"); + } + //考试时长 + entity.ExamTimeLength = (endTime - startTime).TotalMinutes; } exam_ExamPlanIBLL.SavePlanTime(EPId, list); return Success("保存成功!"); @@ -303,7 +312,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers exam_ExamPlanLessonIBLL.PlanLessonTimeByEPId(keyValue); return Success("操作成功!"); } - + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml index 72044bbf9..f16cdbf5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml @@ -86,17 +86,17 @@
- @* - @*