Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Course/RB_Class_Time_ViewModel.cs

@@ -39,6 +39,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassName { get; set; }
 
+        /// <summary>
+        /// 老师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
 
         /// <summary>
         /// 教室id

Edu.Module.Course/ClassModule.cs

@@ -1063,7 +1063,7 @@ namespace Edu.Module.Course
                     int checkStatus = -1;
                     if (ClassTimeId > 0 && checkList != null && checkList.Any())
                     {
-                        checkStatus = checkList?.Where(qitem => qitem.ClassCheckId == ClassTimeId && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.Id)?.FirstOrDefault()?.CheckStatus ?? -1;
+                        checkStatus = checkList?.Where(qitem => qitem.ClassTimeId == ClassTimeId && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.Id)?.FirstOrDefault()?.CheckStatus ?? -1;
                     }
                     list.Add(new
                     {

Edu.Repository/Course/RB_Class_TimeRepository.cs

@@ -159,9 +159,10 @@ WHERE 1=1
         public List<RB_Class_Time_ViewModel> GetClassTimeList(RB_Class_Time_ViewModel query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@" SELECT a.*,c.ClassName,b.ClassRoomId from rb_class_time as a LEFT JOIN rb_class_plan as b on a.ClassPlanId=b.ClassPlanId 
+            builder.AppendFormat(@" SELECT a.*,c.ClassName,b.ClassRoomId,t.TeacherName from rb_class_time as a LEFT JOIN rb_class_plan as b on a.ClassPlanId=b.ClassPlanId 
 LEFT JOIN rb_class as c on a.ClassId=c.ClassId
-where b.`Status`=0 and DATE_FORMAT(b.ClassDate,'%y/%m/%d')=DATE_FORMAT(NOW(),'%y/%m/%d')  and c.`Status`=0 and c.ClassStatus=2 ");
+LEFT JOIN rb_teacher as t on b.TeacherId=t.TId
+where b.`Status`=0 and DATE_FORMAT(b.ClassDate,'%y/%m/%d')=DATE_FORMAT(NOW(),'%y/%m/%d') and t.`Status`=0  and c.`Status`=0 and c.ClassStatus=2 ");
             if (query != null)
             {
                 if (query.ClassPlanId > 0)

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -974,12 +974,12 @@ namespace Edu.WebApi.Controllers.Course
                 StudyNum = base.ParmJObj.GetInt("StudyNum"),
                 TeacherId = base.ParmJObj.GetInt("TeacherId"),
                 ClassId = base.ParmJObj.GetInt("classId"),
-                ClassCheckId = base.ParmJObj.GetInt("ClassCheckId", 0),
+                ClassTimeId = base.ParmJObj.GetInt("ClassTimeId", 0),
             };
             exModel.ClassDate = Convert.ToDateTime(exModel.ClassDate.ToString("yyyy-MM-dd 00:00:00"));
-            if (exModel.ClassCheckId == 0)
+            if (exModel.ClassTimeId == 0)
             {
-                return ApiResult.Failed("请上课时间ID不能等于0");
+                return ApiResult.Failed("上课时间ID不能等于0");
             }
             list.Add(exModel);
             if (list == null || !list.Any())
@@ -1005,11 +1005,11 @@ namespace Edu.WebApi.Controllers.Course
             }
 
             //判断当天是否有已签到数据
-            var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, ClassCheckId = exModel.ClassCheckId, StartDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
+            var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, ClassTimeId = exModel.ClassTimeId, StartDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
 
             foreach (var item in list)
             {
-                var signModel = checkLogList?.Where(qitem => qitem.ClassCheckId == item.ClassCheckId && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
+                var signModel = checkLogList?.Where(qitem => qitem.ClassTimeId == item.ClassTimeId && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
                 if (signModel != null && signModel.ClassCheckId > 0)
                 {
                     item.ClassCheckId = signModel.ClassCheckId;

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -281,7 +281,7 @@ namespace Edu.WebApi.Controllers.Course
                         {
                             Id = item.ClassTimeId,
                             Title = roomList.Where(x => x.ClassPlanId == item.ClassPlanId).FirstOrDefault()?.ClassName,
-                            Content = "",
+                            Content = roomList.Where(x => x.ClassPlanId == item.ClassPlanId).FirstOrDefault()?.TeacherName,
                             StartTime = item.StartTime,
                             EndTime = item.EndTime,
                             InfoTime = Convert.ToDateTime(planModel.ClassDate.ToString("yyyy-MM-dd ") + item.StartTime),