Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

@@ -270,17 +270,17 @@ namespace Learun.Application.WebApi.Modules
                 {
                     startDate = StartTime.ToString("yyyy-MM-dd");
                 }
-                endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(9).ToString("yyyy-MM-dd");
+                endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(13).ToString("yyyy-MM-dd");
                 param.StartDate = startDate;
                 param.EndDate = endDate;
             }
-            var Data = arrangeLessonTermIBLL.GetTimeTableInEducation("", "", "", "", "");
+            var Data = new List<TwoDevelopment.EducationalAdministration.TimeTable>();
             if (param.Description == "学生")
             {
                 var Stulist = stuInfoBasicIBLL.GetAllList().Where(x => x.StuNo == param.Account).FirstOrDefault();
                 if (Stulist != null)
                 {
-                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, Stulist.ClassNo, "", "");
+                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, Stulist.ClassNo, "", "").ToList();
                 }
             }
             else if (param.Description == "教师")
@@ -289,7 +289,7 @@ namespace Learun.Application.WebApi.Modules
                 var empInfo = empInfoIbll.GetAllList().Where(x => x.EmpNo == param.Account).FirstOrDefault().EmpNo;
                 if (empInfo != null)
                 {
-                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.Account, "");
+                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.Account, "").ToList();
                 }
             }
 
@@ -326,7 +326,7 @@ namespace Learun.Application.WebApi.Modules
                              }
                ;
             var result = new
-            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", startDate = startDate, endDate = endDate, weekList = formatData };
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", startDate = param.StartDate, endDate = param.EndDate, weekList = formatData };
             return Success(result);
 
         }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -100,8 +100,10 @@
   <add key="verifypwd" value="false"/>
   <!--疫情防控组角色Id-->
   <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
+  <!--系主任角色Id-->
+  <add key="DeptDirectorRoleId" value="cccde0ce-ebfe-41f2-9a78-e49aaa21cd5a" />
   <add key="QJUrl" value="www.qj.com"/>
   <!-- 报名选修课的最大课程数 -->
   <add key="ElectiveLessonApplyMax" value="2" />
-  
+ 
 </appSettings>