考试记录-安排时间

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs

@@ -4,6 +4,7 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System;
+using System.Linq;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -109,7 +110,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         }
 
         /// <summary>
-        /// 安排考试
+        /// 安排时间
         /// </summary>
         /// <param name="EPId"></param>
         /// <returns></returns>
@@ -145,6 +146,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult Generate(string keyValue)
         {
+            var data = exam_ExamPlanIBLL.GetPlanTimeList(keyValue);
+            if (data.Count() <= 0)
+            {
+                return Fail("请先安排时间！");
+            }
+
             if (!exam_ExamPlanIBLL.IsGenerate(keyValue))
             {
                 return Fail("请先安排考试！");

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/FormTime.js

@@ -62,7 +62,9 @@ var bootstrap = function ($, learun) {
                     var html = '';
                     if (data && data.length > 0) {
                         for (var i = 0; i < data.length; i++) {
-                            var id = learun.newGuid();
+                            var id = data[i].Id;
+                            var ExamDate = learun.formatDate(data[i].ExamDate,'yyyy-MM-dd') ;
+
                             var html = '';
                             html += '<div id="' + id + '">';
                             html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
@@ -71,7 +73,7 @@ var bootstrap = function ($, learun) {
                             html += '</div>';
                             html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
                             html += '<div class="lr-form-item-title">考试日期<font face="宋体">*</font></div>';
-                            html += '<input id="ExamDate' + id + '" 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\'); } })" value="' + data[i].ExamDate + '" />';
+                            html += '<input id="ExamDate' + id + '" 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\'); } })" value="' + ExamDate + '" />';
                             html += '</div>';
                             html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
                             html += '<div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>';
@@ -116,7 +118,7 @@ var bootstrap = function ($, learun) {
                                                     removeByValue(arr, 'iid', parId);
                                                 }
                                             });
-                                            arr.push({ iid: parId, ExamType: $('#ExamType' + parId).val(), ExamDate: $('#ExamDate' + parId).val(), ExamTimeStart: $('#ExamTimeStart' + parId).val(), ExamTimeEnd: $('#ExamTimeEnd' + parId).val() });
+                                            arr.push({ iid: parId});
 
                                             //arr.sort(sortBy("Sort"));
                                             //page.refreshRes();
@@ -130,6 +132,7 @@ var bootstrap = function ($, learun) {
                     } else {
                         page.addcontent();
                     }
+                    //console.log('arr', arr);
                 });
             }
         },
@@ -143,7 +146,7 @@ var bootstrap = function ($, learun) {
             html += '</div>';
             html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
             html += '<div class="lr-form-item-title">考试日期<font face="宋体">*</font></div>';
-            html += '<input id="ExamDate' + id + '" 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\'); } })" />';
+            html += '<input id="ExamDate' + id + '" 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\'); } })" />';
             html += '</div>';
             html += '<div class="col-xs-6 lr-form-item" data-table="Exam_ExamPlanTime">';
             html += '<div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>';
@@ -189,7 +192,6 @@ var bootstrap = function ($, learun) {
 
                             //arr.sort(sortBy("Sort"));
                             //page.refreshRes();
-
                         }
                     }
             });
@@ -210,8 +212,9 @@ var bootstrap = function ($, learun) {
         }
         var data = [];
         arr.forEach(function (item, index, array) {
-            data.push({ ExamType: $('#ExamType' + item.iid).lrselectGet(), ExamDate: $('#ExamDate' + item.iid).val(), ExamTimeStart: $('#ExamTimeStart' + item.iid).val(), ExamTimeEnd: $('#ExamTimeEnd' + item.iid).val() });
+            data.push({Id:learun.newGuid(),EPId:keyValue, ExamType: $('#ExamType' + item.iid).lrselectGet(), ExamDate: $('#ExamDate' + item.iid).val(), ExamTimeStart: $('#ExamTimeStart' + item.iid).val(), ExamTimeEnd: $('#ExamTimeEnd' + item.iid).val() });
         });
+       // console.log('data', data);
         if (data.length == 0) {
             return learun.alert.warning('请安排考试时间！');
         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs

@@ -179,14 +179,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 db.BeginTrans();
-                foreach (var entity in list)
-                {
-                    entity.Create();
-                    entity.EPId = EPId;
-                    db.Insert(entity);
-                }
+                db.Delete<Exam_ExamPlanTimeEntity>(x => x.EPId == EPId);
+                db.Insert(list);
+
                 db.Commit();
-                //this.BaseRepository("CollegeMIS").Delete<Exam_ExamPlanEntity>(t => t.EPId == keyValue);
             }
             catch (Exception ex)
             {