Merge branch '北屯中职分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 北屯中职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/BC_EffectEvaluation/Index.js

@@ -69,10 +69,10 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/BC_EffectEvaluation/GetPageList',
                 headData: [
-                    { label: "评估人", name: "Name", width: 100, align: "left"},
-                    { label: "评估对象", name: "Name1", width: 100, align: "left" },
                     { label: "序号", name: "xh", width: 100, align: "left" },
                     { label: "班级", name: "classname", width: 100, align: "left" },
+                    { label: "评估对象", name: "Name1", width: 100, align: "left" },
+                    { label: "评估人", name: "Name", width: 100, align: "left" },
                     { label: "评估结果", name: "Result", width: 100, align: "left"},
                     { label: "评估时间", name: "ResultTime", width: 100, align: "left"},
                     { label: "备注", name: "Remark", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -1000,7 +1000,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                         foreach (var item in LessonList)
                         {
                             var classinfo = classData.FirstOrDefault(m => m.ClassNo == item.classnumber);
-                            var timesArr = item.timetext.Split(',');
+                            var timesArr = item.timetext.Substring(0, item.timetext.Length - 1).Split(',');
                             foreach (var timesItem in timesArr)
                             {
                                 var insertData = new ArrangeLessonTermEntity