页面修改

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -225,6 +225,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string StuStageName { get; set; }
 
+        /// <summary>
+        /// 客户类型名称
+        /// </summary>
+        public string StuTypeName { get; set; }
+
         /// <summary>
         /// 归属类型(1-全部，2-我负责的，3-我协同的)
         /// </summary>

Edu.Module.User/StudentModule.cs

@@ -80,6 +80,11 @@ namespace Edu.Module.User
         /// </summary>
         private readonly RB_StageRepository stageRepository = new RB_StageRepository();
 
+        /// <summary>
+        /// 学员类型仓储层对象
+        /// </summary>
+        private readonly RB_Student_TypeRepository student_TypeRepository = new RB_Student_TypeRepository();
+
         /// <summary>
         /// 获取学生列表
         /// </summary>
@@ -100,7 +105,6 @@ namespace Edu.Module.User
         /// <returns></returns>
         public List<RB_Student_ViewModel> GetStudentPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_ViewModel query)
         {
-           
             var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Count > 0)
             {
@@ -109,9 +113,11 @@ namespace Edu.Module.User
                 {
                     Group_Id = list[0].Group_Id
                 });
+                //学员类型列表
+                var stuTypeList = student_TypeRepository.GetStudentTypeListRepository(new RB_Student_Type_Extend());
                 string stuIds = string.Join(",", list.Select(qitem => qitem.StuId));
                 //学员跟进
-                var followList= followRepository.GetStudentFollowListRepository(new Model.ViewModel.Customer.RB_Student_Follow_Extend()
+                var followList= followRepository.GetStudentFollowListRepository(new RB_Student_Follow_Extend()
                 {
                     QStuIds = stuIds
                 });
@@ -190,8 +196,6 @@ namespace Edu.Module.User
                     });
                 }
 
-
-
                 foreach (var item in list)
                 {
                     var tempOrderList = stuOrderList?.Where(qitem => qitem.Student_Id == item.StuId)?.ToList();
@@ -224,6 +228,7 @@ namespace Edu.Module.User
                     }
 
                     item.StuStageName = stageList?.FirstOrDefault(qitem => qitem.Id == item.StuStage)?.StageName ?? "";
+                    item.StuTypeName = stuTypeList?.FirstOrDefault(qitem => qitem.Id == item.StuType)?.Name ?? "";
                 }
             }
             return list;
@@ -348,6 +353,7 @@ namespace Edu.Module.User
                 });
                 extModel.AssistList = assistList;
                 extModel.StuStageName = stageRepository.GetEntity(extModel.StuStage)?.StageName ?? "";
+                extModel.StuTypeName = student_TypeRepository.GetEntity(extModel.StuType)?.Name ?? "";
             }
             return extModel;
         }

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -112,7 +112,9 @@ namespace Edu.WebApi.Controllers.Customer
             model.UpdateTime = DateTime.Now;
             model.Group_Id = base.UserInfo.Group_Id;
             model.School_Id = base.UserInfo.School_Id;
-
+            model.ApproveState = 1;
+            model.ApproveId= base.UserInfo.Id;
+            model.ApproveTime = DateTime.Now;
             var flag = customerModule.SetCustomerModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -737,6 +737,10 @@ namespace Edu.WebApi.Controllers.User
                     item.TrialLessonCount,
                     item.StuSourceId,
                     item.StuSourceIdName,
+                    item.QQ,
+                    item.WeChatNo,
+                    item.StuType,
+                    item.StuTypeName,
                 });
             }
             pageModel.Count = rowsCount;
@@ -847,7 +851,6 @@ namespace Edu.WebApi.Controllers.User
                 QQ=base.ParmJObj.GetStringValue("QQ"),
                 WeChatNo=base.ParmJObj.GetStringValue("WeChatNo")
             };
-
             string message = "";
             var customer = base.AppletCustomerInfo;
             //是否是同行注册
@@ -1160,6 +1163,10 @@ namespace Edu.WebApi.Controllers.User
                 extModel.PlatformName,
                 AssistList = extModel?.AssistList ?? new List<RB_Student_Assist_Extend>(),
                 extModel.StuSourceId,
+                extModel.QQ,
+                extModel.WeChatNo,
+                extModel.StuType,
+                extModel.StuTypeName,
             };
             return ApiResult.Success(data: obj);
         }