页面修改

Edu.Module.Course/ClassModule.cs

@@ -1280,7 +1280,7 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="classId">班级编号</param>
         /// <returns></returns>
-        public object GetClassStudentListModule(int classId, int school_Id, int group_Id, int ClassTimeId, int QEffectStatus = 0)
+        public object GetClassStudentListModule(int classId, int school_Id, int group_Id, int ClassTimeId, int QEffectStatus = 0,int QNoFinish=0)
         {
             List<object> list = new List<object>();
             var orderStudentList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel()
@@ -1303,6 +1303,10 @@ namespace Edu.Module.Course
                 var classTimeModel = class_TimeRepository.GetClassTimeList_V2(new RB_Class_Time_ViewModel { ClassTimeId = ClassTimeId, Group_Id = group_Id }).FirstOrDefault();
                 orderStudentList = orderStudentList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(classTimeModel.NewPlanDateTime)))).ToList();
             }
+            if (QNoFinish == 1)
+            {
+                orderStudentList = orderStudentList.Where(qitem => qitem.GuestState == 1&&(qitem.TotalHours-qitem.CompleteHours)>0).ToList();
+            }
             if (orderStudentList != null && orderStudentList.Count > 0)
             {
                 foreach (var item in orderStudentList)

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -107,7 +107,7 @@ WHERE 1=1
                     {
                         //待我审批
                         case Common.Enum.Course.EduReceiptConditionEnum.WaitAgree:
-                            builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0}) ", query.CreateBy);
+                            builder.AppendFormat(" AND A.VerifyStatus NOT IN(6) AND EXISTS (SELECT 1 FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0}) ", query.CreateBy);
                             break;
                         //已审批的
                         case Common.Enum.Course.EduReceiptConditionEnum.Agree:

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -726,8 +726,8 @@ namespace Edu.WebApi.Controllers.Course
             var classId = base.ParmJObj.GetInt("ClassId");
             var schoolId = 0;
             int QEffectStatus = base.ParmJObj.GetInt("QEffectStatus");
- 
-            var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id, 0, QEffectStatus: QEffectStatus);
+            int QNoFinish = base.ParmJObj.GetInt("QNoFinish");
+            var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id, 0, QEffectStatus: QEffectStatus, QNoFinish: QNoFinish);
             return ApiResult.Success(data: data);
         }