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 @@
- @*
+
 开始录入  提交教务处  去审核成绩  设置成绩比例 -
*@ +
- @*
+
比例设置: 平时成绩占比 0 %, 期中成绩占比 0 %, @@ -108,7 +108,7 @@ 分钟(秒)
续时
-
*@ +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs index 5fa59f7ae..8c8f984d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs @@ -17,7 +17,7 @@ namespace Learun.Application.WebApi.Modules public class EvalApi : BaseApi { public EvalApi() - : base("/learun/adms/eval") + : base("/learun/eval") { Get["/paper"] = GetPaper;// 获取组织机构数据映射表 Get["/studentlist"] = GetStudentList; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs index 9e0b2009a..157874cb1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs @@ -40,6 +40,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("EXAMTIMEEND")] public string ExamTimeEnd { get; set; } /// + /// 考试时长 + /// + [Column("EXAMTIMELENGTH")] + public double? ExamTimeLength { get; set; } + /// /// 排考名称 /// [Column("EXAMTYPE")]