页面修改

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -219,5 +219,10 @@ namespace Edu.Model.ViewModel.User
         /// 客户阶段名称
         /// </summary>
         public string StuStageName { get; set; }
+
+        /// <summary>
+        /// 归属类型(1-全部，2-我负责的，3-我协同的)
+        /// </summary>
+        public int BelongType { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_StudentRepository.cs

@@ -194,6 +194,24 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND DATE_FORMAT(t.{0},'%y/%m/%d')= DATE_FORMAT('{1}','%y/%m/%d') ", nameof(RB_Student_ViewModel.CreateTime), query.QDate);
                 }
+                if (query.BelongType > 0)
+                {
+                    //全部
+                    if (query.BelongType == 1)
+                    { 
+                       
+                    }
+                    //我负责的
+                    if (query.BelongType == 2)
+                    {
+                       
+                    }
+                    //我协同的
+                    if (query.BelongType == 3)
+                    { 
+                    
+                    }
+                }
             }
             builder.AppendFormat(" ORDER BY t.{0} DESC ", nameof(RB_Student_ViewModel.StuId));
             return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.WebApi/Controllers/B2BApp/B2BAppController.cs

@@ -80,6 +80,7 @@ namespace Edu.WebApi.Controllers.B2BApp
             {
                 var timeModel = timeList.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault();
                 var tempBalanceList = balanceList?.Where(qitem => qitem.OrderId == item.OrderId)?.ToList();
+                var gModel = item?.GuestList?.FirstOrDefault();
                 result.Add(new
                 {
                     item.CourseId,
@@ -95,7 +96,7 @@ namespace Edu.WebApi.Controllers.B2BApp
                     OrderStateName = item.OrderState.ToName(),
                     CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
                     item.GuestNum,
-                    GuestList = item.GuestList.Select(qitem => new { qitem.GuestName }),
+                    GuestList = item.GuestList.Select(qitem => new { qitem.GuestName,qitem.TotalHours,qitem.CompleteHours }),
                     item.Income,
                     item.ClassStatus,
                     ClassStatusName = item.ClassStatus.ToName(),
@@ -104,6 +105,8 @@ namespace Edu.WebApi.Controllers.B2BApp
                     item.B2BBackground,
                     item.B2BIcon,
                     item.OrderId,
+                    TotalHours=gModel?.TotalHours??0,
+                    CompleteHours=gModel?.CompleteHours??0,
                 });
             }
             pageModel.PageData = result;

Edu.WebApi/Controllers/Customer/CustomerStudentController.cs

@@ -329,7 +329,15 @@ namespace Edu.WebApi.Controllers.Customer
             {
                 StuId = base.ParmJObj.GetInt("StuId"),
             };
-            query.Group_Id = base.UserInfo.Group_Id;
+            if (base.AppletCustomerInfo != null && base.AppletCustomerInfo.GroupId > 0)
+            {
+                query.Group_Id = base.AppletCustomerInfo.GroupId;
+            }
+            if (query.Group_Id <= 0)
+            {
+                query.Group_Id = base.UserInfo.Group_Id;
+            }
+           
             var data = customerStudentModule.GetStudentLogPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             List<object> list = new List<object>();
             foreach (var item in data)

Edu.WebApi/Controllers/User/UserController.cs

@@ -669,6 +669,7 @@ namespace Edu.WebApi.Controllers.User
                 StuStage = base.ParmJObj.GetInt("StuStage"),
                 StartTime = base.ParmJObj.GetStringValue("StartTime"),
                 EndTime = base.ParmJObj.GetStringValue("EndTime"),
+                BelongType=base.ParmJObj.GetInt("BelongType"),
             };
             if (query.IsQueryMyStu == 1)
             {