From 9ca7c13f6bc7c3866576051f3385c0373884105f Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 10 Jun 2022 10:00:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95=E5=AE=89?=
 =?UTF-8?q?=E6=8E=92=E6=97=B6=E9=97=B4=E6=96=B0=E5=A2=9E=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Exam_ExamPlanController.cs        | 15 ++++++++++++---
 .../Exam_ExamPlanTime/Exam_ExamPlanTimeEntity.cs  |  5 +++++
 2 files changed, 17 insertions(+), 3 deletions(-)

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.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; }
         /// <summary>
+        /// 考试时长
+        /// </summary>
+        [Column("EXAMTIMELENGTH")]
+        public double? ExamTimeLength { get; set; }
+        /// <summary>
         /// 排考名称
         /// </summary>
         [Column("EXAMTYPE")]