页面修改

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -65,7 +65,6 @@ namespace Edu.Repository.Sell
         /// 获取列表
         /// </summary>
         /// <param name="demodel"></param>
-        /// <param name="orderIds"></param>
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetCommonOrderGuestListRepository(RB_Order_Guest_ViewModel demodel)
         {
@@ -112,15 +111,16 @@ namespace Edu.Repository.Sell
             }
 
             string sql = $@" 
-SELECT sog.Student_Id as StudentId,A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
+SELECT sog.Student_Id as StudentId,A.*,cs.ClassName,cs.ClassNo,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
        ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,B.EnterID
        ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,IFNULL(D.FirstClassHours,0)+IFNULL(D.SecondClassHours,0)+IFNULL(D.ThirdClassHours,0) AS ContractTotalHours
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
-LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
+     LEFT JOIN rb_class AS cs ON B.ClassId=cs.ClassId
+     LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
      LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
      LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
      LEFT JOIN rb_education_contract AS D ON A.OrderId=D.OrderId AND A.Id=D.GuestId AND D.IsSystemUse=1
-WHERE 1=1 and A.Status=0 {where}";
+WHERE 1=1 and A.Status=0  {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
 
@@ -226,8 +226,6 @@ WHERE 1=1 AND A.Status=0
             }
         }
 
-
-
         /// <summary>
         /// 获取列表
         /// </summary>
@@ -359,11 +357,7 @@ WHERE  1=1 and A.Status=0 and class.Status=0   and b.OrderState<>3
         /// <summary>
         /// 获取分页列表
         /// </summary>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="rowsCount"></param>
         /// <param name="demodel"></param>
-        /// <param name="orderIds"></param>
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetStopingStudentPage(RB_Order_Guest_ViewModel demodel)
         {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1272,6 +1272,24 @@ namespace Edu.WebApi.Controllers.Course
             return result ? ApiResult.Success() : ApiResult.Failed("签到失败");
         }
 
+        /// <summary>
+        /// 获取班级学生树形列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassStudentTree()
+        {
+            var query = new RB_Order_Guest_ViewModel()
+            {
+                GuestName = base.ParmJObj.GetStringValue("GuestName"),
+                ClassName = base.ParmJObj.GetStringValue("ClassName"),
+                ClassNo = ParmJObj.GetStringValue("ClassNo"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var obj = classModule.GetClassStudentTreeModule(query);
+            return ApiResult.Success(data: obj);
+        }
+
         /// <summary>
         /// 签到
         /// </summary>