From 933e1398aa40c692353660d1c1179e0d9f17b80e Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Wed, 1 Mar 2023 09:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E8=A1=A5=E8=80=83=E5=90=8D=E5=8D=95=E6=9F=A5=E7=9C=8B=E3=80=91?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E4=BB=BB=E8=AF=BE=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E4=B8=80=E5=88=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuScoreNotPass/IndexUnpass.js                       | 1 +
 .../StuScoreNotPass/StuScoreNotPassEntity.cs                   | 1 +
 .../StuScoreNotPass/StuScoreNotPassService.cs                  | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

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 5574e1b7d..699868274 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	
@@ -110,6 +110,7 @@ var bootstrap = function ($, learun) {
                         label: "姓名", name: "stuname", width: 100, align: "left"
                     },
                     { label: "课程", name: "LessonName", width: 100, align: "left" },
+                    { label: "任课老师", name: "EmpName", width: 100, align: "left" },
                     { label: "考试年级", name: "Grade", width: 100, align: "left" },
                     {
                         label: "学年", name: "AcademicYearNo", width: 80, align: "left",
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 93343a916..eab37a02b 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	
@@ -345,6 +345,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public string stuno { get; set; }
         public string stuname { get; set; }
         public string EmpNo { get; set; }
+        public string EmpName { get; set; }
         public string LessonName { get; set; }
         public string Grade { get; set; }
         public string AcademicYearNo { 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 141793201..dbf3898d0 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	
@@ -194,11 +194,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 //                and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10))  ");
 
                 //新
-                strSql.Append(@"select ISNULL(ssnp.Score,0) as BKScore,ssnp.CheckMark as IsSubmit,c.classname,a.*,CONVERT(varchar,a.OrdinaryScore) as OrdinaryScore2,CONVERT(varchar,a.TermEndScore) as TermEndScore2,CONVERT(varchar,a.Score) as Score2,b.MoveType,b.StudyModality 
+                strSql.Append(@"select ISNULL(ssnp.Score,0) as BKScore,ssnp.CheckMark as IsSubmit,c.classname,a.*,CONVERT(varchar,a.OrdinaryScore) as OrdinaryScore2,CONVERT(varchar,a.TermEndScore) as TermEndScore2,CONVERT(varchar,a.Score) as Score2,b.MoveType,b.StudyModality,e.EmpName  
 from StuScore a 
 left join StuScoreNotPass ssnp on ssnp.StuNo=a.StuNo and ssnp.AcademicYearNo=a.AcademicYearNo and ssnp.Semester=a.Semester and ssnp.LessonNo=a.LessonNo  
 left join ClassInfo c on c.ClassNo=a.ClassNo
 left join StuInfoBasic b on b.StuNo=a.StuNo
+left join EmpInfo e on e.EmpNo=a.EmpNo
 where 1=1 and a.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1)
 and a.LessonSortNo='1'
 and a.Score<60