From e767a127f49040a0a7903d36c45f711ac1e53c8d Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 30 Mar 2022 12:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=93=E4=B8=9A=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E8=AE=A1=E5=88=92=20=E6=9C=AA=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E8=AF=BE=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArrangeLessonTerm/ArrangeLessonTermService.cs          | 7 ++++---
 .../TeachClass/TeachClassEntity.cs                         | 2 ++
 2 files changed, 6 insertions(+), 3 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 d09fcddb9..1d75b8766 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	
@@ -1211,6 +1211,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                     .FirstOrDefault(m => m.LessonNo == item.LessonSortDetailNo)?.LessonSortDetailNo,
                                 StartWeek = item.StartWeek,
                                 EndWeek = item.EndWeek,
+                                WeekLessonHour = item.ClassHour,
                                 CheckStyleNo = "1",
                                 ScoreRecordStyleNo = "1",
                                 TeachDeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo,
@@ -1221,7 +1222,8 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                 CheckMarkDept = "1",
                                 CheckMark = "1",
                                 TestMark = 0,
-                                F_SchoolId = item.F_SchoolId
+                                F_SchoolId = item.F_SchoolId,
+                                State = 0
                             };
                             if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo &&
                                                               m.Semester == insertData.Semester &&
@@ -1246,8 +1248,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                     }
                     await BaseRepository("CollegeMIS").InsertAsync(insertDataList);
                 }
-                #region MyRegion
-                //学生选课数据
+                #region 学生选课数据
                 var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync<TeachClassEntity>(@"SELECT   *
                 FROM      TeachClass
                 WHERE   (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "'  ")).ToList();
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs
index a16b6e8b6..46e29051e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs	
@@ -120,6 +120,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public string LessonName { get; set; }
         [NotMapped]
         public string LessonSortDetailNo { get; set; }
+        [NotMapped]
+        public int? ClassHour { get; set; }
 
         #endregion