From 829eddf0ae2c4192beef0611ddc3f176196aba11 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 7 Jul 2022 14:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=A1=A5?= =?UTF-8?q?=E8=80=83=E5=90=8D=E5=8D=95=E6=9F=A5=E7=9C=8B=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0=E5=BD=A2=E5=BC=8F=E5=92=8C?= =?UTF-8?q?=E5=BC=82=E5=8A=A8=E7=B1=BB=E5=9E=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScoreNotPass/IndexUnpass.js | 23 +++++++++++++++++++ .../StuScoreNotPass/InputScoreIndex.cshtml | 3 --- .../StuScoreNotPass/StuScoreNotPassEntity.cs | 2 ++ .../StuScoreNotPass/StuScoreNotPassService.cs | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) 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 fe1cc34db..5574e1b7d 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 @@ -128,6 +128,29 @@ 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: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudyModality', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "异动类型", name: "MoveType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StuChangeType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, ], mainId: 'ID', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml index dd1e7a67d..87d030286 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml @@ -90,9 +90,6 @@  提交教务处  去审核成绩 -
-  导出 -
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs index cfc438519..d35642f9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs @@ -344,6 +344,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string Score2 { get; set; } public string BKScore { get; set; } public string IsSubmit { get; set; } + public string MoveType { get; set; } + public string StudyModality { get; set; } } } 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 b164e90eb..12cec5055 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 @@ -176,7 +176,7 @@ else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) -else CONVERT(varchar,a.Score) end as Score2 "); +else CONVERT(varchar,a.Score) end as Score2,b.MoveType,b.StudyModality "); strSql.Append(@" from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo "); strSql.Append( @" left join StuScoreNotPass ssnp on ssnp.StuNo = a.StuNo and ssnp.lessonno = a.lessonno ");