From 306f082232e39e611087d9be6bd6b60a7350dcdc Mon Sep 17 00:00:00 2001
From: dao <qq804260@live.cn>
Date: Wed, 19 Jun 2024 17:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E4=BF=AE=E5=90=8D=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=A2=9E=E5=8A=A0=E7=BC=93=E8=80=83=EF=BC=8C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=A2=9E=E5=8A=A0=E7=BC=93=E8=80=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml          | 6 +++++-
 .../Views/StuScoreNotPassTwo/IndexUnpassTwo.js              | 6 ++++++
 .../StuScoreNotPassTwo/StuScoreNotPassTwoService.cs         | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

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 @@
                                     <div class="lr-form-item-title">课程</div>
                                     <div id="LessonNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">缓考</div>
+                                    <div id="IsSlow"></div>
+                                </div>
                             </div>
                         </div>
                     </div>
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<NotPassEntity>(strSql.ToString(), pagination);