页面修改

Edu.Module.Course/ClassModule.cs

@@ -1268,7 +1268,54 @@ namespace Edu.Module.Course
             return flag;
         }
 
-
+        /// <summary>
+        /// 初始化签到
+        /// </summary>
+        /// <param name="Ids"></param>
+        /// <param name="DropOutRemark"></param>
+        /// <returns></returns>
+        public virtual bool InitClassCheckModule()
+        {
+            List<RB_Class_Check_ViewModel> list = new List<RB_Class_Check_ViewModel>();
+            bool flag = false;
+            var checkList= classCheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel());
+            var basic= class_ConfigRepository.GetBasicMinutesRepository(100000);
+            if (checkList != null && checkList.Count > 0)
+            {
+                classCheckRepository.ClearCheck();
+                string classIds = string.Join(",", checkList.Select(qitem => qitem.ClassId));
+                var planList= class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel() { QClassIds = classIds });
+                foreach (var item in checkList)
+                {
+                    var tempPlanList = planList.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassDate == item.ClassDate).ToList();
+                    foreach (var subItem in tempPlanList)
+                    {
+                        RB_Class_Check_ViewModel model = new RB_Class_Check_ViewModel()
+                        {
+                            ClassCheckId=0,
+                            ClassId=item.ClassId,
+                            ClassDate=item.ClassDate,
+                            Status=item.Status,
+                            ClassRoomId=item.ClassRoomId,
+                            Group_Id=item.Group_Id,
+                            School_Id=item.School_Id,
+                            TeacherId=item.TeacherId,
+                            OrderGuestId=item.OrderGuestId,
+                            CheckStatus=item.CheckStatus,
+                            CreateBy=item.CreateBy,
+                            CreateTime=item.CreateTime,
+                            StudyNum=subItem.ClassMinutes,
+                            MakeUpStatus=item.MakeUpStatus,
+                            CurrentDeductionHours=subItem.ClassMinutes/ basic,
+                            IsAbsentHours=item.IsAbsentHours,
+                            ClassTimeId=subItem.ClassTimeId
+                        };
+                        flag= classCheckRepository.Insert(model)>0;
+                    }
+                }
+            }
+            return flag;
+        }
 
         /// <summary>
         /// 计算学员缺课课时

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -387,5 +387,12 @@ GROUP BY A.ClassId
             string sql = $@"SELECT OrderGuestId, SUM(StudyNum) as MinutesNum FROM rb_class_check where `Status`=0 and Group_Id ={groupId} and CheckStatus =0 and OrderGuestId in ({guestIds}) group by OrderGuestId";
             return Get<RB_Class_Check_ViewModel>(sql).ToList();
         }
+
+        public bool ClearCheck()
+        {
+            string sql = " TRUNCATE TABLE rb_class_check ";
+            base.ExecuteScalar(sql);
+            return true;
+        }
     }
 }

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -78,7 +78,8 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
-       ,Time.StartTime,time.EndTime,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
+       ,Time.StartTime,time.EndTime,time.ClassTimeId
+       ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
 FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
      LEFT JOIN rb_class_time AS time ON A.ClassPlanId=Time.ClassPlanId

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -939,6 +939,15 @@ namespace Edu.WebApi.Controllers.Course
             return result ? ApiResult.Success() : ApiResult.Failed("签到失败");
         }
 
+        /// <summary>
+        /// 初始化签到数据
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult InitClassCheck()
+        {
+            bool result = classModule.InitClassCheckModule();
+            return result ? ApiResult.Success("初始化成功!") : ApiResult.Failed("初始化失败!");
+        }
 
         /// <summary>
         /// 签到