页面修改

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs

@@ -39,6 +39,31 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string GuestName { get; set; }
 
+        /// <summary>
+        /// 学员状态
+        /// </summary>
+        public int GuestState { get; set; }
+
+        /// <summary>
+        /// 学员状态
+        /// </summary>
+        public string GuestStateStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.GuestState)
+                {
+                    case 1: str = "正常"; break;
+                    case 2: str = "退学"; break;
+                    case 3: str = "申请退学中"; break;
+                    case 4: str = "驳回申请"; break;
+                    case 5: str = "停课"; break;
+                }
+                return str;
+            }
+        }
+
         /// <summary>
         /// 班级名称
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -1099,7 +1099,6 @@ namespace Edu.Module.Course
                 if (flag)
                 {
                     var guestModel = order_GuestRepository.GetEntity(item.OrderGuestId);
-                    item.MakeUpStatus = 1;
                     if (!(guestModel.GuestState == 1 || guestModel.GuestState == 3))
                     {
                         item.CurrentDeductionHours = 0;
@@ -1108,13 +1107,23 @@ namespace Edu.Module.Course
                     {
                         item.CurrentDeductionHours = totalMinutes / BasicMinutes;
                     }
-
                     if (item.ClassCheckId > 0)
                     {
-                        flag = classCheckRepository.Update(item);
+                        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},
+                        };
+                        List<WhereHelper> wheres = new List<WhereHelper>()
+                        {
+                          new WhereHelper (nameof(RB_Class_Check_ViewModel.ClassCheckId),item.ClassCheckId)
+                        };
+                        flag = classCheckRepository.Update(fileds, wheres);
                     }
                     else
                     {
+                        item.MakeUpStatus = 1;
                         var newId = classCheckRepository.Insert(item);
                         item.ClassCheckId = newId;
                         flag = newId > 0;
@@ -1146,11 +1155,12 @@ namespace Edu.Module.Course
                 var checkList = classCheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel()
                 {
                     ClassId = checkModel.ClassId,
-                    OrderGuestId = checkModel.OrderGuestId
+                    OrderGuestId = checkModel.OrderGuestId,
+                    EndDate=Common.ConvertHelper.FormatDate(checkModel.ClassDate)
                 }).OrderByDescending(qitem => qitem.ClassDate).ToList();
                 for (var i = 0; i < checkList.Count; i++)
                 {
-                    if (checkList[i].CheckStatus == 1)
+                    if ((checkList[i].CheckStatus == 1 )&&(checkList[i].MakeUpStatus == 3|| checkList[i].MakeUpStatus == 1))
                     {
                         NoFinishHours += checkList[i].CurrentDeductionHours;
                     }

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -77,13 +77,14 @@ WHERE 1=1 AND A.Status=0 ");
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" 
-SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,IFNULL(C.ClassName,'') AS ClassName,IFNULL(D.CourseName,'') AS CourseName,IFNULL(E.RoomName,'') AS RoomName,IFNULL(F.TeacherName,'') AS TeacherName
+SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,IFNULL(B.GuestState,0) AS GuestState,IFNULL(C.ClassName,'') AS ClassName
+      ,IFNULL(D.CourseName,'') AS CourseName,IFNULL(E.RoomName,'') AS RoomName,IFNULL(F.TeacherName,'') AS TeacherName
 FROM RB_Class_Check AS A LEFT JOIN rb_order_guest AS B ON A.OrderGuestId=B.Id 
      LEFT JOIN rb_class AS C ON A.ClassId=C.ClassId
 	 LEFT JOIN rb_course AS D ON C.CouseId=D.CourseId
 	 LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
 	 LEFT JOIN rb_teacher AS F ON A.TeacherId=F.TId
-WHERE 1=1 AND A.Status=0 ");
+WHERE 1=1 AND A.Status=0  ");
           builder.AppendFormat(" AND A.{0} IN(2,3) ", nameof(RB_Class_Check_ViewModel.MakeUpStatus));
             if (query != null)
             {
@@ -153,6 +154,7 @@ WHERE 1=1 AND A.Status=0 ");
                     parameters.Add("RoomName", "%" + query.RoomName.Trim() + "%");
                 }
             }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Class_Check_ViewModel.ClassDate));
             return GetPage<RB_Class_Check_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(),parameters).ToList();
         }
 

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -760,6 +760,8 @@ namespace Edu.WebApi.Controllers.Course
                     item.ClassCheckId,
                     item.OrderGuestId,
                     item.GuestName,
+                    item.GuestState,
+                    item.GuestStateStr,
                     item.ClassId,
                     item.ClassName,
                     item.CourseName,