From 1d00fbe9bb908a51ba5efd49bad27d52b29fc51d Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 31 Mar 2022 11:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=80=E8=AF=BE=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=B8=93=E4=B8=9A=E9=83=A8=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermService.cs | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 1d75b8766..aa8245d60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -775,7 +775,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration MakeDate = DateTime.Now, AcademicYearNo = item.schoolYear, Semester = item.semester.shangxia, - //DeptNo = majorData.Find(m => m.MajorNo == item.majorNumber).DeptNo, + DeptNo = majorData.Find(m => m.MajorNo == item.majorNumber).DeptNo, MajorNo = item.majorNumber, LessonNo = item.curriculumNumber, LessonName = item.curriculumName, @@ -787,7 +787,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration EndWeek = !string.IsNullOrEmpty(item.semester.zhouci) ? Convert.ToInt32(item.semester.zhouci) : 1, CheckStyleNo = "1", ScoreRecordStyleNo = "1", - //TeachDeptNo = majorData.Find(m => m.MajorNo == item.majorNumber).DeptNo, + TeachDeptNo = majorData.Find(m => m.MajorNo == item.majorNumber).DeptNo, StudyScore = lessonData.FirstOrDefault(m => m.LessonNo == item.curriculumNumber)?.StudyScore, AmendDate = DateTime.Now, ClassroomType = 1, @@ -800,7 +800,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration }; if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && - //m.DeptNo == insertData.DeptNo && + m.DeptNo == insertData.DeptNo && m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && m.Grade == insertData.Grade && @@ -808,7 +808,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0 && insertDataList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && - //m.DeptNo == insertData.DeptNo && + m.DeptNo == insertData.DeptNo && m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo && m.Grade == insertData.Grade && @@ -856,7 +856,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest insertDatastuselect.TermEndScoreScale = 1; insertDatastuselect.OtherScoreScale = 1; insertDatastuselect.TeachClassNo = stu.ClassNo; - insertDatastuselect.LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.LessonSortNo; + insertDatastuselect.LessonSortNo = "1"; insertDatastuselect.StuSortNo = "02"; insertDatastuselect.Grade = stu.Grade; insertDatastuselect.StudyScore = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).StudyScore == null ? 0 : lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).StudyScore; @@ -1103,24 +1103,24 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest { AcademicYearNo = teachClassEntity.AcademicYearNo, Semester = teachClassEntity.Semester, - //DeptNo = classitemEntity?.DeptNo, + DeptNo = classitemEntity?.DeptNo, MajorNo = classitemEntity?.MajorNo, LessonNo = teachClassEntity.LessonNo, Grade = classitemEntity?.Grade, - LessonSortNo = teachClassEntity.LessonSortNo, + LessonSortNo = "1", TeachClassNo = teachClassEntity.TeachClassNo, EmpNo = teachClassEntity.EmpNo, F_SchoolId = entity.F_SchoolId }; //非空判断 if (TeachClassData.Count(m => m.AcademicYearNo == insertTeachClassData.AcademicYearNo && - m.Semester == insertTeachClassData.Semester && //m.DeptNo == insertTeachClassData.DeptNo && + m.Semester == insertTeachClassData.Semester && m.DeptNo == insertTeachClassData.DeptNo && m.MajorNo == insertTeachClassData.MajorNo && m.LessonNo == insertTeachClassData.LessonNo && m.Grade == insertTeachClassData.Grade && m.LessonSortNo == insertTeachClassData.LessonSortNo && m.TeachClassNo == insertTeachClassData.TeachClassNo && m.EmpNo == insertTeachClassData.EmpNo && m.F_SchoolId == insertTeachClassData.F_SchoolId) == 0 && insertTeachClassDataList.Count(m => m.AcademicYearNo == insertTeachClassData.AcademicYearNo && - m.Semester == insertTeachClassData.Semester && //m.DeptNo == insertTeachClassData.DeptNo && + m.Semester == insertTeachClassData.Semester && m.DeptNo == insertTeachClassData.DeptNo && m.MajorNo == insertTeachClassData.MajorNo && m.LessonNo == insertTeachClassData.LessonNo && m.Grade == insertTeachClassData.Grade && m.LessonSortNo == insertTeachClassData.LessonSortNo && m.TeachClassNo == insertTeachClassData.TeachClassNo && m.EmpNo == insertTeachClassData.EmpNo && @@ -1199,14 +1199,13 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest MakeDate = now, AcademicYearNo = item.AcademicYearNo, Semester = item.Semester, - //DeptNo = majorData.FirstOrDefault(m => m.ID == item.major.sid)?.DeptNo, + DeptNo = majorData.FirstOrDefault(m => m.MajorNo ==item.MajorNo)?.DeptNo, MajorNo = item.MajorNo, LessonNo = item.LessonNo, LessonName = item.LessonName, PartCode = "", Grade = item.Grade, - LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.LessonSortNo) - ?.LessonSortNo, + LessonSortNo = "1", LessonSortDetailNo = lessonData .FirstOrDefault(m => m.LessonNo == item.LessonSortDetailNo)?.LessonSortDetailNo, StartWeek = item.StartWeek, @@ -1283,7 +1282,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest insertDatastuselect.TermEndScoreScale = 1; insertDatastuselect.OtherScoreScale = 1; insertDatastuselect.TeachClassNo = stu.ClassNo; - insertDatastuselect.LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.LessonSortNo; + insertDatastuselect.LessonSortNo = "1"; insertDatastuselect.StuSortNo = "02"; insertDatastuselect.Grade = stu.Grade; insertDatastuselect.StudyScore = 0;