From a1cd4e50e0da65addbed1258f142603569aa42f7 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 21 Dec 2022 12:14:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=BD=95=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuScore/StuScoreService.cs | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 353403bf0..31b0a0824 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 @@ -2250,26 +2250,26 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var semester_dr = dr["学期"].ToString().Trim(); var lessoninfo_dr = dr["课程名称"].ToString().Trim(); var classinfo_dr = dr["班级"].ToString().Trim(); - var lessonNo_dr = lessonInfoList.FirstOrDefault(x => x.LessonName == lessoninfo_dr)?.LessonNo; - var classNo_dr = classInfoList.FirstOrDefault(x => x.ClassName == classinfo_dr)?.ClassNo; + //var lessonNo_dr = lessonInfoList.FirstOrDefault(x => x.LessonName == lessoninfo_dr)?.LessonNo; + //var classNo_dr = classInfoList.FirstOrDefault(x => x.ClassName == classinfo_dr)?.ClassNo; if (!string.IsNullOrEmpty(stuno)) { num++; - if (!academicYearNo_dr.Equals(AcademicYearNo) || !semester_dr.Equals(semester_dr)) + if (!academicYearNo_dr.Equals(AcademicYearNo) || !semester_dr.Equals(Semester)) { dr["导入错误"] = "学年学期与查询条件不符！"; failDt.Rows.Add(dr.ItemArray); continue; } - var item = list.Find(x => x.StuNo == stuno && x.LessonNo == lessonNo_dr && x.ClassNo == classNo_dr); - if (item == null) + if (!lessoninfo_dr.Equals(lessonInfoEntity.LessonName) || !classinfo_dr.Equals(classInfoEntity.ClassName)) { dr["导入错误"] = "课程：" + lessonInfoEntity.LessonName + "，班级：" + classInfoEntity.ClassName + "找不到学号为" + stuno + "的学生"; failDt.Rows.Add(dr.ItemArray); continue; } + var item = list.Find(x => x.StuNo == stuno && x.LessonNo == LessonNo && x.ClassNo == ClassNo); var OrdinaryScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["平时成绩"].ToString().Trim()) ? "0" : dr["平时成绩"].ToString().Trim()); var TermInScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期中成绩"].ToString().Trim()) ? "0" : dr["期中成绩"].ToString().Trim()); var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期末成绩"].ToString().Trim()) ? "0" : dr["期末成绩"].ToString().Trim()); @@ -2354,7 +2354,8 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var classRoomList = db.FindList(); var lessonInfoList = db.FindList(); - var lessonInfoEntity = lessonInfoList.FirstOrDefault(x => x.LessonNo == LessonNo); + var lessonInfoEntity = lessonInfoList.FirstOrDefault(x => x.LessonNo == LessonNo && x.CheckMark == true); + var classRoomEntity = classRoomList.FirstOrDefault(x => x.ClassroomNo == ClassRoomNo); //成绩比例数据 var stuSelectLessonListOfElectiveEntity = this.BaseRepository("CollegeMIS").FindEntity(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.LessonNo == LessonNo && x.LessonSortNo == "2" && x.ClassRoomNo == ClassRoomNo && x.LessonSection == LessonSection); @@ -2382,19 +2383,20 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var classRoominfo_dr = dr["教室名称"].ToString().Trim(); var lessonSection_dr = dr["节次"].ToString().Trim(); - var lessonNo_dr = lessonInfoList.FirstOrDefault(x => x.LessonName == lessoninfo_dr)?.LessonNo; - var classRoomNo_dr = classRoomList.FirstOrDefault(x => x.ClassroomName == classRoominfo_dr)?.ClassroomNo; + //var lessonNo_dr = lessonInfoList.FirstOrDefault(x => x.LessonName == lessoninfo_dr)?.LessonNo; + //var classRoomNo_dr = classRoomList.FirstOrDefault(x => x.ClassroomName == classRoominfo_dr)?.ClassroomNo; if (!string.IsNullOrEmpty(stuno)) { num++; - var item = list.Find(x => x.StuNo == stuno && x.LessonNo == lessonNo_dr && x.ClassRoomNo == classRoomNo_dr && x.LessonSection == lessonSection_dr); + var item = list.Find(x => x.StuNo == stuno && x.LessonNo == LessonNo && x.ClassRoomNo == ClassRoomNo && x.LessonSection == LessonSection); if (!academicYearNo_dr.Equals(AcademicYearNo) || !semester_dr.Equals(semester_dr)) { dr["导入错误"] = "学年学期与查询条件不符！"; failDt.Rows.Add(dr.ItemArray); continue; } - if (item == null) + if (!lessoninfo_dr.Equals(lessonInfoEntity.LessonName) || !classRoominfo_dr.Equals(classRoomEntity.ClassroomName) || !lessonSection_dr.Equals(LessonSection)) + //if (item == null) { dr["导入错误"] = "课程：" + lessonInfoEntity.LessonName + "在" + LessonSection + "节次找不到学号为" + stuno + "的学生"; failDt.Rows.Add(dr.ItemArray);