学籍信息管理、我的班级 导出修复

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

@@ -475,18 +475,18 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
-                    {
-                        label: "入党时间", name: "BankCard", width: 100, align: "center",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
-                        }
-                    },
-                    {
-                        label: "入团时间", name: "BankCard", width: 100, align: "center",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
-                        }
-                    },
+                    //{
+                    //    label: "入党时间", name: "BankCard", width: 100, align: "center",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{
+                    //    label: "入团时间", name: "BankCard", width: 100, align: "center",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
                     { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
                     { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
                     { label: "QQ", name: "QQ", width: 100, align: "center" },

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

@@ -343,18 +343,18 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
-                    {
-                        label: "入党时间", name: "BankCard", width: 100, align: "center",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
-                        }
-                    },
-                    {
-                        label: "入团时间", name: "BankCard", width: 100, align: "center",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
-                        }
-                    },
+                    //{
+                    //    label: "入党时间", name: "BankCard", width: 100, align: "center",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
+                    //{
+                    //    label: "入团时间", name: "BankCard", width: 100, align: "center",
+                    //    formatter: function (cellvalue) {
+                    //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                    //    }
+                    //},
                     { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
                     { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
                     { label: "QQ", name: "QQ", width: 100, align: "center" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs

@@ -432,7 +432,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append(" where 1=1 ");
                 //未选课的学分为空导出报错liang 为了导出数据零时增加了条件 此处暂放待处理 and c.LessonNo is not null 
                 //去掉转校、休学 退学的学生
-                strSql.Append(" and a.StuNo not in (SELECT distinct StuNo FROM StuInfoBasicChange where stuchangetype in ('06','04','05')) ");
+                strSql.Append(" and a.StuNo not in (SELECT distinct StuNo FROM StuInfoBasicChange where stuchangetype in ('06','04','05') and checkstatus=1) ");
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["StuNo"].IsEmpty())