From a2137279ba4a1cf181d6db29ce83006c4f0422f6 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 3 Aug 2023 16:29:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=85=A8?= =?UTF-8?q?=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AE=9E=E8=AE=AD=E8=AF=BE=E7=9A=84?= =?UTF-8?q?=E6=88=90=E7=BB=A9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/AllStuScoreQueryIndex.js | 9 ++++---- .../EADateArrange/EADateArrangeService.cs | 5 +++-- .../StuScore/StuScoreEntity.cs | 8 ++++++- .../StuScore/StuScoreService.cs | 22 ++++++++++++++++++- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index baf1c2f77..4590c8c2e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/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" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs index 659a9687d..25207dae6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs +++ b/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 && diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs index 8946527f4..52103b85d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs +++ b/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; } /// - /// 课程类别名称 + /// 课程分类名称 /// /// [NotMapped] public string LessonSortName { get; set; } + /// + /// 课程类型名称 + /// + /// + [NotMapped] + public string LessonTypeName { get; set; } } 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 af91469da..ad5311982 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 @@ -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(strSql.ToString(), dp); }