From 87105afe7e898b48458185567dc46b4edd72170c Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 29 Apr 2022 10:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Exam_ExamPlan/Form.cshtml                        | 4 ----
 .../EducationalAdministration/Views/Exam_ExamPlan/Index.js | 7 ++++---
 .../Exam_ExamPlan/Exam_ExamPlanService.cs                  | 1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml
index 45b9e734b..dc2ca6c33 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml	
@@ -23,10 +23,6 @@
         <div class="lr-form-item-title">排考编号<font face="宋体">*</font></div>
         <input id="PlanCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Exam_ExamPlan" >
-        <div class="lr-form-item-title">排考总人数<font face="宋体">*</font></div>
-        <input id="EPStuCount" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
-    </div>
     <div class="col-xs-12 lr-form-item"  data-table="Exam_ExamPlan" >
         <div class="lr-form-item-title">是否随机座位<font face="宋体">*</font></div>
         <div id="EPRandom" isvalid="yes" checkexpession="NotNull" ></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js
index df7a6bf32..39726ec50 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js	
@@ -177,13 +177,14 @@ var bootstrap = function ($, learun) {
                     {
                         label: "是否生成", name: "EPGenarate", width: 100, align: "left",
                         formatter: function (cellvalue) {
-                            return cellvalue == true ? "是" : "否";
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
                     },
-                    { label: "排序号", name: "EPOrder", width: 100, align: "left" },
+                    { label: "排序号", name: "EPOrder", width: 100, align: "left", },
                 ],
                 mainId: 'EPId',
-                isPage: true
+                isPage: true,
+                sidx:"EPOrder asc "
             });
             page.search();
         },
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs
index 234c68160..686c4c5bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs	
@@ -385,6 +385,7 @@ delete from  Exam_ExamPlanRoom where EPLId in ('{planLessonIds}');");
                 else
                 {
                     entity.Create();
+                    entity.EPStuCount = 0;
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }