Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml

@@ -86,17 +86,17 @@
                         <div class="btn-group btn-group-sm">
                             <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                         </div>
-                        @*<div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <div class=" btn-group btn-group-sm" learun-authorize="yes">
                             <a id="lr_input" class="btn btn-default"><i class="fa fa-edit">&nbsp;开始录入</i></a>
                             <a id="lr_save" class="btn btn-default" style="display:none;"><i class="fa fa-edit">&nbsp;提交成绩</i></a>
                             <a id="lr_check" class="btn btn-default"><i class="fa fa-lock">&nbsp;提交教务处</i></a>
                             <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-lock">&nbsp;去审核成绩</i></a>
                             <a id="lr_setScale" class="btn btn-default"><i class="fa fa-edit">&nbsp;设置成绩比例</i></a>
-                        </div>*@
+                        </div>
                     </div>
 
                 </div>
-                @*<div class="scaleRow divRow">
+                <div class="scaleRow divRow">
                     <span>比例设置：</span>
                     <span>平时成绩占比 <span id="OrdinaryScoreScale">0</span> %，</span>
                     <span>期中成绩占比 <span id="TermInScoreScale">0</span> %，</span>
@@ -108,7 +108,7 @@
                         <span id="minutes" data-minutes="30"></span>分钟（<span id="seconds" data-seconds="60"></span>秒）
                         <div id="addMinutesBtn" data-minutes="30">续时</div>
                     </div>
-                </div>*@
+                </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>
         </div>

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;

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")]