页面修改

Edu.Module.Course/ClassModule.cs

@@ -1057,10 +1057,24 @@ namespace Edu.Module.Course
         /// <param name="DropOutRemark"></param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public bool AddClassCheckModule(List<RB_Class_Check_ViewModel> list)
+        public virtual bool AddClassCheckModule(List<RB_Class_Check_ViewModel> list)
         {
             //写日志
-            bool flag = classCheckRepository.InsertBatch(list);
+            bool flag = true;
+            foreach (var item in list)
+            {
+                if (flag)
+                {
+                    if (item.ClassCheckId > 0)
+                    {
+                        flag = classCheckRepository.Update(item);
+                    }
+                    else
+                    {
+                        flag = classCheckRepository.Insert(item) > 0;
+                    }
+                }
+            }
             return flag;
         }
 

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -11,7 +11,7 @@ namespace Edu.Repository.Course
     public class RB_Class_CheckRepository : BaseRepository<RB_Class_Check>
     {
         /// <summary>
-        /// 获取教室列表
+        /// 获取签到记录列表
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
@@ -39,11 +39,11 @@ namespace Edu.Repository.Course
                 }
                 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.CreateTime), 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.CreateTime), 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);
                 }
             }
 

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -633,16 +633,24 @@ namespace Edu.WebApi.Controllers.Course
                 return ApiResult.Failed("今日无课程，无须签到");
             }
 
-            //判断今天是否已签到
+            //判断当天是否有已签到数据
             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())
+    
+            foreach (var item in list)
             {
-                return ApiResult.Failed("今日已签到，请勿重复操作");
+                var signModel= checkLogList?.Where(qitem => qitem.ClassDate == item.ClassDate && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
+                if (signModel != null && signModel.ClassCheckId > 0)
+                {
+                    item.ClassCheckId = signModel.ClassCheckId;
+                }
+                else
+                {
+                    item.Group_Id = base.UserInfo.Group_Id;
+                    item.CreateTime = System.DateTime.Now;
+                    item.CreateBy = base.UserInfo.Id;
+                    item.Status = 0;
+                }
             }
-            list.ForEach(x => x.Group_Id = base.UserInfo.Group_Id);
-            list.ForEach(x => x.CreateTime = System.DateTime.Now);
-            list.ForEach(x => x.CreateBy = base.UserInfo.Id);
-            list.ForEach(x => x.Status = 0);
             bool result = classModule.AddClassCheckModule(list);
             if (result)
             {