导入数据时转换学年和学期

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -2668,6 +2668,8 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                             if (empinfoEntity == null)
                                 throw (new Exception("查无此教师"));
                             #endregion
+
+                            var semesterAndYear = Common.GetSemesterAndYear(dr["开始日期"].ToString());
                             #region 初始化学期时间
                             startDate = dr["开始日期"].ToDate();
                             endDate = dr["结束日期"].ToDate();
@@ -2712,8 +2714,8 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                                     LessonDate = trueStartDate,
                                     StartTime = TimeSpan.Parse(lessonTime.Item1).ToString(@"hh\:mm"),
                                     EndTime = TimeSpan.Parse(lessonTime.Item2).ToString(@"hh\:mm"),
-                                    AcademicYearNo = dr["学年"].ToString(),
-                                    Semester = dr["学期"].ToString(),
+                                    AcademicYearNo = semesterAndYear.AcademicYearShort,
+                                    Semester = semesterAndYear.Semester,
                                     DeptNo = classEntity.DeptNo,
                                     MajorNo = classEntity.MajorNo,
                                     LessonNo = lessonEntity.LessonNo,