教师排序修改

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js

@@ -96,7 +96,11 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: '学年', name: 'AcademicYearNo', width: 70, align: "left" },
                     { label: '学期', name: 'Semester', width: 60, align: "left" },
-                    { label: '考试日期', name: 'ExamDate', width: 120, align: "left" },
+                    {
+                        label: '考试日期', name: 'ExamDate', width: 100, align: "left", formatter: function (v) {
+                            return learun.formatDate(v, "yyyy-MM-dd");
+                        }
+                    },
                     { label: '考试时间', name: 'ExamTime', width: 120, align: "left" },
                     { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
                     { label: '课程名称', name: 'LessonName', width: 200, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -615,7 +615,7 @@ var bootstrap = function ($, learun) {
 
                 ],
                 mainId: 'EmpId',
-                sidx: 'F_Order asc',
+                sidx: 'DeptOrder,F_Order',
                 isPage: true,
                 isMultiselect: true
             });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -37,8 +37,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.* ");
-                strSql.Append("  FROM EmpInfo t ");
+                strSql.Append("SELECT t.*,b.F_Order as DeptOrder ");
+                strSql.Append("  FROM EmpInfo t left join "+BaseRepository().getDbConnection().Database+".dbo.LR_Base_Department b on t.F_DepartmentId=b.F_DepartmentId ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数