页面修改

Edu.Model/Entity/Customer/RB_Customer_Finishdetails.cs

@@ -44,5 +44,10 @@ namespace Edu.Model.Entity.Customer
 		/// 使用值
 		/// </summary>
 		public decimal FinishValue { get; set; }
+
+		/// <summary>
+		/// 完成编号
+		/// </summary>
+		public int FinishId { get; set; }
 	}
 }

Edu.Model/Entity/User/RB_Student.cs

@@ -176,5 +176,15 @@ namespace Edu.Model.Entity.User
         /// 客户阶段(见枚举)
         /// </summary>
         public StuStageEnum StuStage { get; set; }
+
+        /// <summary>
+        /// 收客渠道
+        /// </summary>
+        public StuChannelEnum StuChannel { get; set; }
+
+        /// <summary>
+        /// 第三方平台名称
+        /// </summary>
+        public string PlatformName { get; set; }
     }
 }

Edu.Module.User/StudentModule.cs

@@ -58,6 +58,11 @@ namespace Edu.Module.User
         /// </summary>
         private readonly RB_Student_FollowRepository followRepository = new RB_Student_FollowRepository();
 
+        /// <summary>
+        /// 学员协助人员仓储层对象
+        /// </summary>
+        private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository();
+
         /// <summary>
         /// 获取学生列表
         /// </summary>

Edu.Repository/Customer/RB_Customer_FinishdetailsRepository.cs

@@ -46,6 +46,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Customer_Finishdetails_Extend.CustomerId), query.CustomerId);
                 }
+                if (query.FinishId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Customer_Finishdetails_Extend.FinishId), query.FinishId);
+                }
             }
             return GetPage<RB_Customer_Finishdetails_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }

Edu.Repository/User/RB_StudentRepository.cs

@@ -281,6 +281,14 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
                 {
                     logContent += string.Format("来源：由【{0}】=>【{1}】,", oldModel.StuSource.ToName(), model.StuSource.ToName());
                 }
+                if (oldModel.StuChannel != model.StuChannel)
+                {
+                    logContent += string.Format("收客渠道：由【{0}】=>【{1}】,", oldModel.StuChannel.ToName(), model.StuChannel.ToName());
+                }
+                if (oldModel.PlatformName != model.PlatformName)
+                {
+                    logContent += string.Format("地三方平台名称：由【{0}】=>【{1}】,", oldModel.PlatformName, model.PlatformName);
+                }
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Student_ViewModel.StuName),model.StuName.Trim() },
@@ -303,6 +311,8 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
                     {nameof(RB_Student_ViewModel.StuIDCard),model.StuIDCard },
                     {nameof(RB_Student_ViewModel.StuIDCardAddress),model.StuIDCardAddress },
                     {nameof(RB_Student_ViewModel.StuStage),model.StuStage },
+                    {nameof(RB_Student_ViewModel.StuChannel),model.StuChannel },
+                    {nameof(RB_Student_ViewModel.PlatformName),model.PlatformName },
                 };
                 flag = base.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StuId));
                 createBy = model.UpdateBy;

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -413,6 +413,7 @@ namespace Edu.WebApi.Controllers.Customer
                 TaskId = base.ParmJObj.GetInt("TaskId"),
                 DetailId = base.ParmJObj.GetInt("DetailId"),
                 CustomerId=base.ParmJObj.GetInt("CustomerId"),
+                FinishId=base.ParmJObj.GetInt("GetCustomerFinishtaskDetailsPage"),
             };
             var list = taskModule.GetCustomerFinishdetailsPageModule(pageModel.PageIndex,pageModel.PageSize,out long rowsCount, query);
             pageModel.Count = rowsCount;

Edu.WebApi/Controllers/User/UserController.cs

@@ -658,9 +658,9 @@ namespace Edu.WebApi.Controllers.User
                 CreateBy = base.ParmJObj.GetInt("CreateBy"),
                 IsQueryMyStu = base.ParmJObj.GetInt("IsQueryMyStu"),
                 CustomerId = base.ParmJObj.GetInt("CustomerId"),
-                StuStage=(StuStageEnum)base.ParmJObj.GetInt("StuStage"),
-                StartTime=base.ParmJObj.GetStringValue("StartTime"),
-                EndTime=base.ParmJObj.GetStringValue("EndTime"),
+                StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage"),
+                StartTime = base.ParmJObj.GetStringValue("StartTime"),
+                EndTime = base.ParmJObj.GetStringValue("EndTime"),
             };
             if (query.IsQueryMyStu == 1)
             {
@@ -741,7 +741,9 @@ namespace Edu.WebApi.Controllers.User
                 StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
                 StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
                 StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
-                StuStage=(StuStageEnum)base.ParmJObj.GetInt("StuStage"),
+                StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage"),
+                StuChannel = (StuChannelEnum)base.ParmJObj.GetInt("StuChannel"),
+                PlatformName = base.ParmJObj.GetStringValue("PlatformName"),
             };
             if (extModel.StuId == 0)
             {
@@ -795,7 +797,7 @@ namespace Edu.WebApi.Controllers.User
                 StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
                 StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
                 StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
-                StuStage =(StuStageEnum)base.ParmJObj.GetInt("StuStage"),
+                StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage"),
             };
             extModel.CreateType = 2;
             if (extModel.StuId == 0)
@@ -820,6 +822,16 @@ namespace Edu.WebApi.Controllers.User
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 获取收客平台列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetStuChannelList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(StuChannelEnum));
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 学员转交
         /// </summary>
@@ -893,7 +905,7 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuTel,
                 extModel.StuIcon,
                 extModel.StuSex,
-                StuBirth= Common.ConvertHelper.FormatDate(extModel.StuBirth),
+                StuBirth = Common.ConvertHelper.FormatDate(extModel.StuBirth),
                 StuBirthStr = Common.ConvertHelper.FormatDate(extModel.StuBirth),
                 extModel.ProviceId,
                 extModel.CityId,
@@ -924,6 +936,9 @@ namespace Edu.WebApi.Controllers.User
                 extModel.StuStage,
                 StuStageName = extModel.StuStage.ToName(),
                 extModel.CreateBy,
+                extModel.StuChannel,
+                StuChannelName = extModel.StuChannel.ToName(),
+                extModel.PlatformName,
             };
             return ApiResult.Success(data: obj);
         }