diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml
index da3304a88..6c0bf6ac7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml
@@ -34,10 +34,14 @@
课程
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js
index 9f143c3f2..6da38943d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js
@@ -76,6 +76,7 @@ var bootstrap = function ($, learun) {
$('#ClassNo').lrDataSourceSelect({
code: 'bjsj', value: 'classno', text: 'classname'
});
+ $('#IsSlow').lrDataItemSelect({ code: 'YesOrNoInt' });
$('#LessonNo').lrDataSourceSelect({
code: 'LessonInfo', value: 'lessonno', text: 'lessonname'
});
@@ -124,6 +125,11 @@ var bootstrap = function ($, learun) {
{ label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" },
{ label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" },
{ label: "成绩", name: "Score2", width: 150, align: "left" },
+ {
+ label: '是否缓考', name: 'IsSlow', width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == true ? "是" : "否";
+ }
+ },
],
mainId: 'ID',
isPage: true,
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 63d9cc1e5..1b454a57d 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
@@ -362,6 +362,10 @@ and (b.EduSystem is null or b.EduSystem != '6') ");
{
strSql.Append($" and ssnpt.CheckMark ='{queryParam["CheckMark"].ToString()}'");
}
+ if (!queryParam["IsSlow"].IsEmpty() && queryParam["IsSlow"].ToString() == "1")
+ {
+ strSql.Append($" and a.IsSlow ='{queryParam["IsSlow"].ToString()}'");
+ }
//旧
//strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) ");
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination);