1

Edu.Repository/Grade/RB_Class_CheckRepository.cs

@@ -969,7 +969,7 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
                 string orderGuestIds = string.Join(",", list.Select(qitem => qitem.OrderGuestId).Distinct());
                 if (!string.IsNullOrEmpty(orderGuestIds))
                 {
-                    guestList= GetOrderGuestListRepository(orderGuestIds);
+                    guestList = GetOrderGuestListRepository(orderGuestIds);
                     oldCheckList = GetClassCheckList(new RB_Class_Check_ViewModel() { QOrderGuestIds = orderGuestIds });
                 }
                 if (guestList != null && guestList.Count > 0)
@@ -977,7 +977,7 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
                     string orderIds = string.Join(",", guestList.Select(qitem => qitem.OrderId).Distinct());
                     if (!string.IsNullOrEmpty(orderIds))
                     {
-                        orderList= GetOrderListRepository(orderIds);
+                        orderList = GetOrderListRepository(orderIds);
                     }
                 }
                 if (orderList != null && orderList.Count > 0)
@@ -985,18 +985,18 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
                     string enterIDs = string.Join(",", orderList.Select(qitem => qitem.EnterID).Distinct());
                     if (!string.IsNullOrEmpty(enterIDs))
                     {
-                        empList= GetEmployeeListRepository(enterIDs);
+                        empList = GetEmployeeListRepository(enterIDs);
                     }
                 }
                 string classTimeIds = string.Join(",", list.Select(qitem => qitem.ClassTimeId).Distinct());
                 if (!string.IsNullOrEmpty(classTimeIds))
                 {
-                    classTimeList = GetClassTimeListRepository(classTimeIds,"");
+                    classTimeList = GetClassTimeListRepository(classTimeIds, "");
                 }
                 string classIds = string.Join(",", list.Select(qitem => qitem.ClassId).Distinct());
                 if (!string.IsNullOrEmpty(classIds))
                 {
-                    classList= GetClassListRepository(classIds);
+                    classList = GetClassListRepository(classIds);
                 }
             }
 
@@ -1190,7 +1190,7 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
                                 // 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
                                 var path = $"/stuMan/studentManage?OrderId={guestModel.OrderId}";
                                 path = HttpUtility.UrlEncode(path);
-                                string markdownContent = $"`缺勤通知` 学员缺勤信息告知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>缺勤时间：<font color='warning'>{Common.ConvertHelper.FormatDate(item.ClassDate)}</font>\n>关联单号：{guestModel.OrderId}\n>班级名称：<font>{classModel?.ClassName??""}</font>\n>请点击：[查看详情]({Common.Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
+                                string markdownContent = $"`缺勤通知` 学员缺勤信息告知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>缺勤时间：<font color='warning'>{Common.ConvertHelper.FormatDate(item.ClassDate)}</font>\n>关联单号：{guestModel.OrderId}\n>班级名称：<font>{classModel?.ClassName ?? ""}</font>\n>请点击：[查看详情]({Common.Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
                                 Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
                                 {
                                     CategoryId = PushMessageCategoryEnum.SalePeople,
@@ -1404,7 +1404,7 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
         /// <param name="list"></param>
         /// <param name="checkType">1-定时任务自动签到，2-后台补录手动签到</param>
         /// <returns></returns>
-        public bool AppointStuCheckRepository(List<RB_Scroll_Appointment_ViewModel> list,int checkType)
+        public bool AppointStuCheckRepository(List<RB_Scroll_Appointment_ViewModel> list, int checkType)
         {
             bool flag = false;
             if (list.Any())
@@ -1416,13 +1416,13 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
 
                 string Date = DateTime.Now.ToString("yyyy-MM-dd");
                 string orderGuestIds = string.Join(",", list.Select(x => x.GuestId).Distinct());
-                var guestList= GetOrderGuestListRepository(orderGuestIds);
+                var guestList = GetOrderGuestListRepository(orderGuestIds);
                 var oldCheckList = GetClassCheckList(new RB_Class_Check_ViewModel() { QOrderGuestIds = orderGuestIds });
                 foreach (var item in list)
                 {
                     string tempSql = " UPDATE RB_Scroll_Appointment SET State={0} WHERE Id={1} ";
                     string newSql = "";
-                    if (item.State == Common.Enum.Course.CourseAppointStateEnum.WaitSure)
+                    if (item.State == Common.Enum.Course.CourseAppointStateEnum.WaitCourse)//之前是12024-09-11 update by:W 待上课的才能签到
                     {
                         newSql = string.Format(tempSql, (int)Common.Enum.Course.CourseAppointStateEnum.Coursed, item.Id);
                     }
@@ -1430,8 +1430,11 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
                     {
                         newSql = string.Format(tempSql, (int)Common.Enum.Course.CourseAppointStateEnum.StuCheck, item.Id);
                     }
+                    if (!string.IsNullOrWhiteSpace(newSql))
+                    {
                         flag = base.Execute(newSql) > 0;
-                    if (flag)
+                    }
+                    if (flag&& !string.IsNullOrWhiteSpace(newSql))
                     {
                         var clist = JsonHelper.DeserializeObject<List<CourseTimeModel>>(item.CourseTime);
                         var gmodel = guestList?.FirstOrDefault(qitem => qitem.Id == item.GuestId);
@@ -1501,8 +1504,8 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
                                         IsAbsentHours = 0,
                                         ClassTimeId = qitem.ClassTimeId,
                                         IsCalcTeacFee = 1,
-                                        CheckRemark="",
-                                        AttendanceMethod= Common.Enum.User.AttendanceMethodEnum.Offline,
+                                        CheckRemark = "",
+                                        AttendanceMethod = Common.Enum.User.AttendanceMethodEnum.Offline,
                                     };
                                     if (checkType == 1)
                                     {
@@ -1562,7 +1565,7 @@ WHERE 1=1 AND A.Status=0  {1} ", builderMakeUp.ToString(), builderWhere.ToString
 SELECT A.*
 FROM RB_Order AS A
 WHERE 1=1 AND A.OrderId IN({0})
-",OrderIds);
+", OrderIds);
 
             return base.Get<RB_Order_ViewModel>(builder.ToString()).ToList();
         }
@@ -1579,7 +1582,7 @@ WHERE 1=1 AND A.OrderId IN({0})
 SELECT A.*
 FROM rb_order_guest AS A
 WHERE 1=1 AND A.Id IN({0})
-",GuestIds);
+", GuestIds);
             return base.Get<RB_Order_Guest_Extend>(builder.ToString()).ToList();
         }
 
@@ -1588,7 +1591,7 @@ WHERE 1=1 AND A.Id IN({0})
         /// </summary>
         /// <param name="ClassTimeIds"></param>
         /// <returns></returns>
-        public List<RB_Class_Time_ViewModel> GetClassTimeListRepository(string ClassTimeIds,string PlanIds)
+        public List<RB_Class_Time_ViewModel> GetClassTimeListRepository(string ClassTimeIds, string PlanIds)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -1619,7 +1622,7 @@ WHERE 1=1
 SELECT A.* 
 FROM RB_Class AS A
 WHERE 1=1 AND A.ClassId IN({0})
-",ClassIds);
+", ClassIds);
 
             return Get<RB_Class_ViewModel>(builder.ToString()).ToList();
         }