From 0a12f25cd8269d5310e92125dd91536ab8e072b6 Mon Sep 17 00:00:00 2001
From: hwh2023 <598694955@qq.com>
Date: Tue, 14 May 2024 17:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=88=90=E7=BB=A9=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuScore/InputScoreIndexInTeacher.js                | 3 +++
 .../Views/StuScoreNotPass/InputScoreIndexInTeacher.js         | 3 +++
 .../Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js      | 3 +++
 .../EducationalAdministration/StuScore/StuScoreService.cs     | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js
index d1ba7368f..cfef234fb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js	
@@ -16,6 +16,9 @@ var headData;   //常规列头
 var headDataEdit;   //可编辑列头
 var headDataNoEdit;     //不可编辑列头
 var headDataFinally;    //最终列头
+var rowJson;
+var columnJson;
+var queryJson;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js
index 1abd77b88..91bd9c321 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js	
@@ -15,6 +15,9 @@ var headData;   //常规列头
 var headDataEdit;   //可编辑列头
 var headDataNoEdit;     //不可编辑列头
 var headDataFinally;    //最终列头
+var rowJson;
+var columnJson;
+var queryJson;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js
index b70ed4ece..ef05cc11f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js	
@@ -15,6 +15,9 @@ var headData;   //常规列头
 var headDataEdit;   //可编辑列头
 var headDataNoEdit;     //不可编辑列头
 var headDataFinally;    //最终列头
+var rowJson;
+var columnJson;
+var queryJson;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs
index 81940fdef..520738bcc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs	
@@ -2255,7 +2255,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                                                 TermInScore * (stuSelectLessonListEntity.TermInScoreScale / 100) +
                                                 TermEndScore * (stuSelectLessonListEntity.TermEndScoreScale / 100) +
                                                 OtherScore * (stuSelectLessonListEntity.OtherScoreScale / 100)), MidpointRounding.AwayFromZero);
-                                    var remark = dr["备注"].ToString().Trim();
+                                    var remark = dr["考试类型"].ToString().Trim();
                                     db.ExecuteBySql($"update StuScore set OrdinaryScore={OrdinaryScore},TermInScore={TermInScore},TermEndScore={TermEndScore},OtherScore={OtherScore},Score={Score},Remark='{remark}' where ScoreId='{item.ScoreId}' ");
 
                                 }
@@ -2411,7 +2411,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                                             TermInScore * (stuSelectLessonListOfElectiveEntity.TermInScoreScale / 100) +
                                             TermEndScore * (stuSelectLessonListOfElectiveEntity.TermEndScoreScale / 100) +
                                             OtherScore * (stuSelectLessonListOfElectiveEntity.OtherScoreScale / 100)), MidpointRounding.AwayFromZero);
-                                var remark = dr["备注"].ToString().Trim();
+                                var remark = dr["考试类型"].ToString().Trim();
                                 db.ExecuteBySql($"update StuScore set OrdinaryScore={OrdinaryScore},TermInScore={TermInScore},TermEndScore={TermEndScore},OtherScore={OtherScore},Score={Score},Remark='{remark}' where ScoreId='{item.ScoreId}' ");
                             }
                             else