From e7e1ac240084e52553cdae72e3db3e28fbea7649 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 16 May 2022 11:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=80=83=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Exam_ExamPlanLessonController.cs          |  5 ++++-
 .../Views/Exam_ExamPlanLesson/Form.cshtml     |  6 ++---
 .../Exam_ExamPlanLessonBLL.cs                 | 22 +++++++++++++++++++
 .../Exam_ExamPlanLessonIBLL.cs                |  2 ++
 .../Exam_ExamPlanLessonService.cs             | 22 +++++++++++++++++++
 5 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs
index e8dbd73ba..12ab302e2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs	
@@ -279,6 +279,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         }
         /// <summary>
         /// 保存实体数据（新增、修改）
+        /// 设置考试时间
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="strEntity">实体</param>
@@ -304,7 +305,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             {
                 entity.ExamTime = entity.ExamTimeStart.Trim() + "-" + entity.ExamTimeEnd;
             }
-
+            //判断考试时间是否冲突
+            //exam_ExamPlanLessonIBLL.IsExamTimeClash(entity);
+            //保存
             exam_ExamPlanLessonIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Form.cshtml
index f425f78b1..5d3a838e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Form.cshtml	
@@ -8,12 +8,12 @@
         <input id="ExamDate" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull"  data-dateFmt="yyyy-MM-dd" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ExamDate').trigger('change'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanLesson">
-        <div class="lr-form-item-title">考试开始时间<font face="宋体">*</font></div>
-        <input id="ExamTimeStart" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"  placeholder="请填写时分，例如：09:00"/>
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="ExamTimeStart" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"  placeholder="请填写时分,例如:09:00"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanLesson">
         <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
-        <input id="ExamTimeEnd" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull" placeholder="请填写时分，例如：12:00"/>
+        <input id="ExamTimeEnd" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull" placeholder="请填写时分,例如:12:00"/>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs
index b0f93bc0a..4e8106348 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonBLL.cs	
@@ -204,6 +204,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 判断考试时间是否冲突
+        /// </summary>
+        /// <param name="entity"></param>
+        public void IsExamTimeClash(Exam_ExamPlanLessonEntity entity)
+        {
+            try
+            {
+                exam_ExamPlanLessonService.IsExamTimeClash(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs
index 71536b4f8..b34662b37 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonIBLL.cs	
@@ -49,6 +49,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, Exam_ExamPlanLessonEntity entity);
+
+        void IsExamTimeClash(Exam_ExamPlanLessonEntity entity);
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs
index 61de941aa..c9b058f10 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs	
@@ -280,6 +280,28 @@ and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan
             }
         }
 
+        /// <summary>
+        /// 判断考试时间是否冲突（未完成）
+        /// </summary>
+        /// <param name="entity"></param>
+        public void IsExamTimeClash(Exam_ExamPlanLessonEntity entity)
+        {
+            try
+            {
+                
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
     }