diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js index f9cdd3fac..672507755 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js @@ -38,6 +38,7 @@ var bootstrap = function ($, learun) { text: 'text' }); $('#DeptNo').lrDataSourceSelect({ + allowSearch: true, code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { var deptno = ""; if (val) { @@ -51,6 +52,7 @@ var bootstrap = function ($, learun) { } }); $('#MajorNo').lrDataSourceSelect({ + allowSearch: true, code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (val) { var majorNo = ''; @@ -74,9 +76,11 @@ var bootstrap = function ($, learun) { } }); $('#ClassNo').lrDataSourceSelect({ + allowSearch: true, code: 'bjsj', value: 'classno', text: 'classname' }); $('#LessonNo').lrDataSourceSelect({ + allowSearch: true, code: 'LessonInfo', value: 'lessonno', text: 'lessonname' }); // 刷新 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs index 32e6e39c9..501189f44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs @@ -208,7 +208,7 @@ else CONVERT(varchar,a.Score) end as Score2 "); strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); } - strSql.Append(" and b.AbmormityMoveMark!='1'"); + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs index e31ad49c3..979fee09a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs @@ -300,7 +300,7 @@ else CONVERT(varchar,a.Score) end as Score2 "); strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); } - strSql.Append(" and b.AbmormityMoveMark!='1' "); + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); } catch (Exception ex)