提交代码

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -92,6 +92,14 @@ namespace Edu.Repository.Course
             return Get<RB_Class_Check_ViewModel>(builder.ToString()).ToList();
         }
 
+
+
+
+
+        
+
+
+
         /// <summary>
         /// 班级总人数
         /// </summary>
@@ -180,5 +188,48 @@ GROUP BY A.ClassId
 ", where);
             return Get<GuestFinishMinute_ViewModel>(builder.ToString()).ToList();
         }
+
+
+
+        /// <summary>
+        /// 获取教室列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Check_ViewModel> GetClassCheckList(RB_Class_Check_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.* FROM RB_Class_Check AS A WHERE 1=1  ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.ClassId), query.ClassId);
+                }
+                if (!string.IsNullOrEmpty(query.Q_ClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_Check_ViewModel.ClassId), query.Q_ClassIds);
+                }
+                if (!string.IsNullOrWhiteSpace(query.StartDate))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%Y-%m-%d')>=DATE_FORMAT('{1}','%Y-%m-%d') ", nameof(RB_Class_Check_ViewModel.ClassDate), query.StartDate);
+                }
+                if (!string.IsNullOrWhiteSpace(query.EndDate))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%Y-%m-%d')<=DATE_FORMAT('{1}','%Y-%m-%d') ", nameof(RB_Class_Check_ViewModel.ClassDate), query.EndDate);
+                }
+            }
+
+            return Get<RB_Class_Check_ViewModel>(builder.ToString()).ToList();
+        }
+
     }
 }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -465,7 +465,7 @@ namespace Edu.WebApi.Controllers.Course
                 }
             }
             var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = data.ClassId });
-            var checkLogList = classModule.GetClassCheckListRepository(new RB_Class_Check_ViewModel { Group_Id = data.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId, StartDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
+            var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = data.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId, StartDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
             List<object> guestList = new List<object>();
             foreach (var item in orderGuestList.Where(x => x.GuestState == 1))
             {
@@ -613,7 +613,7 @@ namespace Edu.WebApi.Controllers.Course
             }
 
             //判断今天是否已签到
-            var checkLogList = classModule.GetClassCheckListRepository(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, StartDate = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = System.DateTime.Now.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, StartDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
             if (checkLogList != null && checkLogList.Any())
             {
                 return ApiResult.Failed("今日已签到，请勿重复操作");