页面修改

Edu.Module.Course/ClassModule.cs

@@ -1417,18 +1417,33 @@ namespace Edu.Module.Course
         public virtual bool InitClassCheckModule()
         {
             List<RB_Class_Check_ViewModel> list = new List<RB_Class_Check_ViewModel>();
-            bool flag = false;
-            var checkList = classCheckRepository.GetGuestFinishMinutesRepository("");
-
+            bool flag = true;
+            var checkList = classCheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel ());
+            var planList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel());
             if (checkList != null && checkList.Count > 0)
             {
-                foreach (var item in checkList)
+                var groupList = checkList.GroupBy(qitem => new { qitem.ClassId, qitem.ClassDate, qitem.OrderGuestId })
+                            .Select(qitem => new { qitem.Key.ClassId, qitem.Key.ClassDate, qitem.Key.OrderGuestId });
+                foreach (var item in groupList)
                 {
-                    Dictionary<string, object> guestFileds = new Dictionary<string, object>()
+                    var tempCheckList = checkList.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassDate == item.ClassDate && qitem.OrderGuestId == item.OrderGuestId).OrderBy(qitem=>qitem.ClassTimeId).ToList();
+                    var tempPlanList = planList.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassDate == item.ClassDate).OrderBy(qitem => qitem.ClassTimeId).ToList();
+                    for (var i = 0; i < tempCheckList.Count; i++)
                     {
-                        { nameof(RB_Order_Guest_ViewModel.CompleteHours),item.FinishClassHours }
-                    };
-                    flag = order_GuestRepository.Update(guestFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), item.GuestId));
+                        if (tempPlanList != null && tempPlanList.Count > 0)
+                        {
+                            var cItem = tempCheckList[i];
+                            cItem.ClassTimeId = tempPlanList[i].ClassTimeId;
+                            if (flag)
+                            {
+                                flag = classCheckRepository.Update(cItem);
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                    }
                 }
             }
             return flag;

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -871,7 +871,7 @@ namespace Edu.WebApi.Controllers.Course
             var query = new RB_Class_Plan_ViewModel()
             {
                 Group_Id = base.UserInfo.Group_Id,
-                School_Id = base.ParmJObj.GetInt("School_Id"),
+                //School_Id = base.ParmJObj.GetInt("School_Id"),
                 ClassId = base.ParmJObj.GetInt("ClassId"),
                 TeacherId = base.ParmJObj.GetInt("TeacherId")
             };