页面修改

Edu.Module.Course/ClassModule.cs

@@ -4756,12 +4756,14 @@ namespace Edu.Module.Course
                                 x.Date, 
                                 x.TeacherId,
                                 x.TeacherName, 
-                                x.RoomId, x.RoomName, 
+                                x.RoomId, 
+                                x.RoomName, 
                                 x.CourseId,
                                 x.CourseName, 
                                 x.ShiftSort,
                                 x.CourseSTime,
                                 x.ChapterNo,
+                                x.State,
                                 //x.CourseGradeNo, 
                             })
                             .OrderBy(x => x.Key.CourseSTime).ToList();
@@ -4817,6 +4819,8 @@ namespace Edu.Module.Course
                                 AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2,
                                 item.Key.ShiftSort,
                                 EnrollNum = item.Count(),
+                                item.Key.State,
+                                StateName=item.Key.State.ToName(),
                                 subAppointList.FirstOrDefault().ScrollMinNum,
                                 subAppointList.FirstOrDefault().ScrollMaxNum
                             });

Edu.WebApi/Controllers/Course/ScrollController.cs

@@ -1062,22 +1062,20 @@ namespace Edu.WebApi.Controllers.Course
             string Date = base.ParmJObj.GetStringValue("Date");
             string ShiftSort = base.ParmJObj.GetStringValue("ShiftSort");
             int NewTeacherId = base.ParmJObj.GetInt("NewTeacherId", 0);
-
             if (TeacherId <= 0 || NewTeacherId <= 0 || string.IsNullOrEmpty(Date) || string.IsNullOrEmpty(ShiftSort))
             {
                 return ApiResult.ParamIsNull();
             }
+            string msg = scrollClassModule.SetScrollTeacherAsync(TeacherId, Date, ShiftSort, NewTeacherId, userInfo).Result;
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed(msg);
+            }
 
-            //string msg = scrollClassModule.SetScrollTeacher(TeacherId, Date, ShiftSort, NewTeacherId, userInfo);
-            //if (msg == "")
-            //{
-            //    return ApiResult.Success();
-            //}
-            //else
-            //{
-            //    return ApiResult.Failed(msg);
-            //}
-            return ApiResult.Success();
         }
 
         /// <summary>
@@ -1092,12 +1090,10 @@ namespace Edu.WebApi.Controllers.Course
             string Date = base.ParmJObj.GetStringValue("Date");
             string ShiftSort = base.ParmJObj.GetStringValue("ShiftSort");
             int RoomId = base.ParmJObj.GetInt("RoomId", 0);//新教室ID
-
             if (TeacherId <= 0 || RoomId <= 0 || string.IsNullOrEmpty(Date) || string.IsNullOrEmpty(ShiftSort))
             {
                 return ApiResult.ParamIsNull();
             }
-
             string msg = scrollClassModule.SetScrollRoomAsync(TeacherId, Date, ShiftSort, RoomId, userInfo).Result;
             if (msg == "")
             {