Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

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",

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; }

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