修复班级学籍管理的问题

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js

@@ -35,8 +35,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 200, align: "left" },
+                    { label: "学籍号", name: "StuCode", width: 200, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -120,8 +120,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
-                    { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
+                    {
+                        label: "报到日期", name: "RegisterDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "入学年月", name: "EntranceDate", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     {
                         label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
                         formatter: function (cellvalue) {
@@ -137,7 +147,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
-                isMultiselect: true,
+                //isMultiselect: true,
                 //onSelectRow: function (rowdata) {
                 //    if (rowdata.CheckMark == "1") {
                 //        $("#check").hide();
@@ -153,7 +163,7 @@ var bootstrap = function ($, learun) {
                 //}
 
             });
-            //page.search();
+            page.search();
         },
         search: function (param) {
             param = param || {};

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

@@ -104,7 +104,16 @@ var bootstrap = function ($, learun) {
                     { label: "学号", name: "StuNo", width: 200, align: "left" },
                     { label: "姓名", name: "StuName", width: 200, align: "left" },
                     {
-                        label: "处分名称", name: "PunishName", width: 200, align: "left"
+                        label: "处分名称", name: "PunishNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'Punishment',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
                     },
                     { label: "处分原因", name: "PunishReason", width: 300, align: "left" },
                     { label: "处分日期", name: "PunishDate", width: 200, align: "left" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -345,7 +345,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var ClassDiredctorNo = LoginUserInfo.Get().account;
-                return this.BaseRepository("CollegeMIS").FindTable($" SELECT * FROM dbo.ClassInfo where ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'");
+                string sql = " SELECT * FROM dbo.ClassInfo  where CheckMark=1 ";
+                if (ClassDiredctorNo.ToUpper() != "SYSTEM")
+                {
+                    sql += $"  and ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'";
+                }
+                return this.BaseRepository("CollegeMIS").FindTable(sql);
             }
             catch (Exception ex)
             {
@@ -512,7 +517,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void GetCard(string keyValue,string status)
+        public void GetCard(string keyValue, string status)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try