Merge branch '怀来职教中心中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 怀来职教中心中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js

@@ -55,10 +55,11 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGridLei({
                 url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuNo2',
                 headData: [
-                    { label: '学号', name: 'StuNo', width: 100, align: "left" },
-                    { label: '姓名', name: 'StuName', width: 200, align: "left" },
-                    { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
-                    { label: '学期', name: 'Semester', width: 100, align: "left" },
+                    { label: '学号', name: 'StuNo', width: 150, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 150, align: "left" },
+                    { label: '学年', name: 'AcademicYearNo', width: 80, align: "left" },
+                    { label: '学期', name: 'Semester', width: 80, align: "left" },
+                    { label: '课程类型', name: 'LessonTypeName', width: 100, align: "left" },
                     { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
                     { label: '课程名称', name: 'LessonName', width: 300, align: "left" },
                     { label: '总分', name: 'ScoreFormat', width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeacherPlanCheck/Form.cshtml

@@ -20,7 +20,7 @@
         <div id="Path"></div>
     </div>
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title">Score<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">分数<font face="宋体">*</font></div>
         <input id="Score" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs

@@ -429,14 +429,15 @@ and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.
                                     OpenLessonMajorNo = stuItem.MajorNo,
                                     LessonNo = lessonItem.LessonNo,
                                     LessonName = lessonItem.LessonName,
-                                    TeachClassNo=stuItem.ClassNo,
+                                    TeachClassNo = stuItem.ClassNo,
+                                    LessonSortNo = lessonItem.LessonSortNo,
                                     Grade = stuItem.Grade,
                                     OrdinaryScore = 0,
                                     TermInScore = 0,
                                     TermEndScore = 0,
                                     OtherScore = 0,
                                     CheckMark = "0",
-                                    IsEditable="1",
+                                    IsEditable = "1",
                                     F_SchoolId = entity.F_SchoolId,
                                 };
                                 if (StuScoreExperimentList.Count(x => x.F_SchoolId == insertData.F_SchoolId && x.AcademicYearNo == insertData.AcademicYearNo &&

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs

@@ -404,11 +404,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public string ScoreOfNotPassTwo { get; set; }
         /// <summary>
-        /// 课程类别名称
+        /// 课程分类名称
         /// </summary>
         /// <returns></returns>
         [NotMapped]
         public string LessonSortName { get; set; }
+        /// <summary>
+        /// 课程类型名称
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string LessonTypeName { get; set; }
 
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -1880,7 +1880,7 @@ and a.Academicyearno='" + academicYearNo + "' and a.Semester='" + semester + "')
                     tableName = queryParam["TableName"].ToString();
                 }
                 var strSql = new StringBuilder();
-                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName ");
+                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,lt.LessonTypeName ");
                 strSql.Append(" ,case when bb.LessonSortNo='2' then bb.Score else (case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end) end as Score ");
                 strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score)+'(选修)' else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat ");
                 strSql.Append(" from ( ");
@@ -1904,6 +1904,26 @@ and a.Academicyearno='" + academicYearNo + "' and a.Semester='" + semester + "')
                 strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName ) as bb ");
                 strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' ");
                 strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' ");
+                strSql.Append(" left join LessonInfo li on bb.LessonNo=li.LessonNo ");
+                strSql.Append(" left join CdLessonType lt on li.LessonTypeId=lt.LTId ");
+                //关联实训课成绩
+                strSql.Append(" union all ");
+                strSql.Append(" select se.AcademicYearNo,se.Semester,se.LessonSortNo,se.LessonNo,se.LessonName,se.StuNo,se.StuName,lt.LessonTypeName,se.Score,convert(nvarchar(50),se.Score) as ScoreFormat from StuScoreExperiment se ");
+                strSql.Append(" left join LessonInfo li on se.LessonNo=li.LessonNo ");
+                strSql.Append(" left join CdLessonType lt on li.LessonTypeId=lt.LTId ");
+                strSql.Append(" where 1=1 and se.CheckMark='1' ");
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    strSql.Append(" and se.AcademicYearNo=@AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    strSql.Append(" and se.Semester=@Semester ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    strSql.Append(" and se.StuNo=@StuNo ");
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<StuScoreEntity>(strSql.ToString(), dp);
             }