提交代码

Edu.Module.Course/ClassModule.cs

@@ -1298,9 +1298,9 @@ namespace Edu.Module.Course
                         item.RenewOrderId,
                         CheckStatus = checkStatus,
                         item.JoinType,
-                        JoinTypeName=item.JoinType.ToName(),
+                        JoinTypeName = item.JoinType.ToName(),
                         item.TargetJoinType,
-                        TargetJoinTypeName=item.TargetJoinType.ToName(),
+                        TargetJoinTypeName = item.TargetJoinType.ToName(),
                         item.SourceOrderId,
                         item.SourceClassName,
                         item.TargetOrderId,
@@ -1444,13 +1444,18 @@ namespace Edu.Module.Course
                 {
                     var guestModel = order_GuestRepository.GetEntity(item.OrderGuestId);
                     item.CurrentDeductionHours = timeModel?.TimeHour ?? 0;
+                    decimal currentDeductionHours = item.CurrentDeductionHours;
+                    if (item.CheckStatus == 2)
+                    {
+                        currentDeductionHours = 0;
+                    }
                     if (item.ClassCheckId > 0)
                     {
                         Dictionary<string, object> fileds = new Dictionary<string, object>()
                         {
                             { nameof(RB_Class_Check_ViewModel.CheckStatus),item.CheckStatus},
                             { nameof(RB_Class_Check_ViewModel.StudyNum),item.StudyNum},
-                            { nameof(RB_Class_Check_ViewModel.CurrentDeductionHours),item.CurrentDeductionHours},
+                            { nameof(RB_Class_Check_ViewModel.CurrentDeductionHours),currentDeductionHours},
                         };
                         List<WhereHelper> wheres = new List<WhereHelper>()
                         {
@@ -1470,7 +1475,7 @@ namespace Edu.Module.Course
                     {
                         //更新学员完成课时
                         var completeHours = (oldModel?.FinishClassHours ?? 0) + item.CurrentDeductionHours;
-                    
+
                         Dictionary<string, object> orderFileds = new Dictionary<string, object>()
                         {
                             {nameof(RB_Order_Guest_ViewModel.CompleteHours),completeHours }
@@ -2589,7 +2594,7 @@ namespace Edu.Module.Course
                     string planIds = string.Join(",", list.Select(qitem => qitem.ClassPlanId));
                     timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel() { QClassIds = classIds, QClassPlanIds = planIds });
                     guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { ClassIds = classIds });
-                    tempGuestList = order_GuestRepository.GetTempInvitationGuest(new Model.ViewModel.EduTask.RB_Temporary_Invitation_ViewModel { ClassIds = classIds,ClassPlanIds=planIds });
+                    tempGuestList = order_GuestRepository.GetTempInvitationGuest(new Model.ViewModel.EduTask.RB_Temporary_Invitation_ViewModel { ClassIds = classIds, ClassPlanIds = planIds });
                 }
                 var visitorList = new List<RB_Visitor_Reserve_Extend>();
                 if (reserveList != null && reserveList.Count > 0)
@@ -2614,7 +2619,7 @@ namespace Edu.Module.Course
 
                         tempTimeGuestList.AddRange(guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || ((qitem.GuestState == 5 || qitem.GuestState == 7) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= subItem.ClassDate))));
 
-                        if (tempGuestList!=null&& tempGuestList.Any())
+                        if (tempGuestList != null && tempGuestList.Any())
                         {
                             tempTimeGuestList.AddRange(tempGuestList.Where(qitem => qitem.ClassId == subItem.ClassId && subItem.ClassPlanId == qitem.ClassPlanId && (qitem.GuestState == 1 || qitem.GuestState == 6 || ((qitem.GuestState == 5 || qitem.GuestState == 7) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= subItem.ClassDate))));
 
@@ -2839,7 +2844,7 @@ namespace Edu.Module.Course
                     {
                         var tempTimeList = timeList?.Where(qitem => qitem.ClassPlanId == subItem.ClassPlanId)?.ToList()?.OrderBy(qitem => qitem.StartTime);
                         var currentDate = Common.ConvertHelper.FormatDate(ClassDate) + " " + (tempTimeList?.FirstOrDefault()?.StartTime ?? "");
-                        
+
                         foreach (var item in tempTimeList)
                         {
                             var tempTimeGuestList = new List<RB_Order_Guest_ViewModel>();

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -572,7 +572,7 @@ WHERE {where}";
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetTempInvitationGuest(Model.ViewModel.EduTask.RB_Temporary_Invitation_ViewModel demodel)
         {
-            string where = $@" 1=1 and A.Status=0  and ti.Status=0 AND (B.IsChaBan=0 OR (B.IsChaBan=1 AND B.EffectStatus IN(1) ))";
+            string where = $@" 1=1 and A.Status=0  and ti.Status=0  AND (B.JoinType=1 OR (B.JoinType=2 AND B.EffectStatus IN(1) )) ";
             if (demodel.Group_Id > 0)
             {
                 where += $@" and A.{nameof(Model.ViewModel.EduTask.RB_Temporary_Invitation_ViewModel.Group_Id)} ={demodel.Group_Id}";

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -809,10 +809,10 @@ namespace Edu.WebApi.Controllers.Course
                     });
                 }
             }
-            foreach (var item in tempGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= data.ClassDate)))
+            foreach (var item in tempGuestList)
             {
-               // if ((item.IsChaBan == 1 && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime))))
-                //{
+                if (item.GuestState == 1 || item.GuestState == 6 || ((item.GuestState == 5 || item.GuestState == 7) && item.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ChangeEffectTime)) >= data.ClassDate))
+                {
                     guestList.Add(new
                     {
                         UserIcon = "",
@@ -836,7 +836,7 @@ namespace Edu.WebApi.Controllers.Course
                         StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0,
                         IsTemp = 1,
                     });
-               // }
+                }
             }
 
             var classMinutes = classModule.GetClassMinutesModule(classId);