课程表学年学期 前端展示

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs

@@ -193,14 +193,29 @@ namespace Learun.Application.WebApi.Modules
             var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
 
             // 获取学年,学期
-            var semesterAndYear = Common.GetSemesterAndYear(startDate);
-            var strAcademicYear = semesterAndYear.AcademicYearLong;
-            var strSemester = semesterAndYear.Semester;
+            var strAcademicYear = "";
+            var strSemester = "";
+            var AcademicYearShort = "";
+            if (!string.IsNullOrEmpty(param.StartDate))
+            {
+                var NewsemesterAndYear = Common.GetSemesterAndYear(param.StartDate);
+                strAcademicYear = NewsemesterAndYear.AcademicYearLong;
+                strSemester = NewsemesterAndYear.Semester;
+                AcademicYearShort = NewsemesterAndYear.AcademicYearShort;
+            }
+            else
+            {
+                var semesterAndYear = Common.GetSemesterAndYear(startDate);
+                strAcademicYear = semesterAndYear.AcademicYearLong;
+                strSemester = semesterAndYear.Semester;
+                AcademicYearShort = semesterAndYear.AcademicYearShort;
+            }
+
 
             if (param.StartDate.IsEmpty() && param.EndDate.IsEmpty())
             {
                 // 校历
-                var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(semesterAndYear.AcademicYearShort, semesterAndYear.Semester);
+                var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(AcademicYearShort, strSemester);
                 var StartTime = entity.StartTime.Value;
                 //获取第几周
                 var curWeek = WeekOfYear(startdate, entity.StartTime.Value, entity.EndTime.Value);