Skip to content

E
Education
Commit 8dd982e2 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent f4579547
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 125 deletions
Edu.Common/Enum/User/StuStageEnum.cs
View file @ 8dd982e2
...@@ -5,51 +5,5 @@ using System.Text; ...@@ -5,51 +5,5 @@ using System.Text;
namespace Edu.Common.Enum.User namespace Edu.Common.Enum.User
{ {
/// <summary>
/// 客户阶段
/// </summary>
public enum StuStageEnum
{
/// <summary>
/// 新客户
/// </summary>
[EnumField("新客户")]
NewStu = 1,
/// <summary>
/// 初步沟通
/// </summary>
[EnumField("初步沟通")]
PreliminaryCommunication = 2,
/// <summary>
/// 试听
/// </summary>
[EnumField("试听")]
Audition = 3,
/// <summary>
/// 成交
/// </summary>
[EnumField("成交")]
Clinch = 4,
/// <summary>
/// 多次成交
/// </summary>
[EnumField("多次成交")]
MultipleClinch = 5,
/// <summary>
/// 已输单
/// </summary>
[EnumField("已输单")]
OutputOrder = 6,
/// <summary>
/// 无效
/// </summary>
[EnumField("无效")]
InvalidStu = 7,
}
} }
Edu.Model/Entity/User/RB_Student.cs
View file @ 8dd982e2
...@@ -180,7 +180,7 @@ namespace Edu.Model.Entity.User ...@@ -180,7 +180,7 @@ namespace Edu.Model.Entity.User
/// <summary> /// <summary>
/// 客户阶段(见枚举) /// 客户阶段(见枚举)
/// </summary> /// </summary>
public StuStageEnum StuStage { get; set; } public int StuStage { get; set; }
/// <summary> /// <summary>
/// 收客渠道 /// 收客渠道
......
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ 8dd982e2
...@@ -214,5 +214,10 @@ namespace Edu.Model.ViewModel.User ...@@ -214,5 +214,10 @@ namespace Edu.Model.ViewModel.User
/// 来源人名称 /// 来源人名称
/// </summary> /// </summary>
public string StuSourceIdName { get; set; } public string StuSourceIdName { get; set; }
/// <summary>
/// 客户阶段名称
/// </summary>
public string StuStageName { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/OrderModule.cs
View file @ 8dd982e2
...@@ -1071,58 +1071,58 @@ namespace Edu.Module.Course ...@@ -1071,58 +1071,58 @@ namespace Edu.Module.Course
#region 更新客人阶段 #region 更新客人阶段
if (item.IsRenewGuest == 1 && item.StuStage == Common.Enum.User.StuStageEnum.Clinch) //if (item.IsRenewGuest == 1 && item.StuStage == Common.Enum.User.StuStageEnum.Clinch)
{ //{
Dictionary<string, object> keyValues = new Dictionary<string, object>() { // Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Student_ViewModel.StuStage), Common.Enum.User.StuStageEnum.MultipleClinch} // { nameof(RB_Student_ViewModel.StuStage), Common.Enum.User.StuStageEnum.MultipleClinch}
}; // };
List<WhereHelper> wheres = new List<WhereHelper>() { // List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){ // new WhereHelper(){
FiledName = nameof (RB_Student_ViewModel.StuId), // FiledName = nameof (RB_Student_ViewModel.StuId),
FiledValue = item.StuId, // FiledValue = item.StuId,
OperatorEnum =OperatorEnum.Equal // OperatorEnum =OperatorEnum.Equal
} // }
}; // };
studentRepository.Update(keyValues, wheres); // studentRepository.Update(keyValues, wheres);
student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log() // student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
{ // {
LogId = 0, // LogId = 0,
CreateBy = userInfo.Id, // CreateBy = userInfo.Id,
CreateTime = DateTime.Now, // CreateTime = DateTime.Now,
CreateType = 1, // CreateType = 1,
Group_Id = userInfo.Group_Id, // Group_Id = userInfo.Group_Id,
LogContent = "首次续课，客户阶段由'" + (Common.Enum.User.StuStageEnum.Clinch.ToName()) + "'自动转换为'" + (Common.Enum.User.StuStageEnum.MultipleClinch.ToName()) +"'", // LogContent = "首次续课，客户阶段由'" + (Common.Enum.User.StuStageEnum.Clinch.ToName()) + "'自动转换为'" + (Common.Enum.User.StuStageEnum.MultipleClinch.ToName()) +"'",
LogTitle = "客户阶段变更", // LogTitle = "客户阶段变更",
LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo, // LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo,
StuId = item.StuId // StuId = item.StuId
}); // });
} //}
else if (item.StuStage < Common.Enum.User.StuStageEnum.Clinch) //else if (item.StuStage < Common.Enum.User.StuStageEnum.Clinch)
{ //{
Dictionary<string, object> keyValues = new Dictionary<string, object>() { // Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Student_ViewModel.StuStage), Common.Enum.User.StuStageEnum.Clinch} // { nameof(RB_Student_ViewModel.StuStage), Common.Enum.User.StuStageEnum.Clinch}
}; // };
List<WhereHelper> wheres = new List<WhereHelper>() { // List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){ // new WhereHelper(){
FiledName = nameof (RB_Student_ViewModel.StuId), // FiledName = nameof (RB_Student_ViewModel.StuId),
FiledValue = item.StuId, // FiledValue = item.StuId,
OperatorEnum =OperatorEnum.Equal // OperatorEnum =OperatorEnum.Equal
} // }
}; // };
studentRepository.Update(keyValues, wheres); // studentRepository.Update(keyValues, wheres);
student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log() // student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
{ // {
LogId = 0, // LogId = 0,
CreateBy = userInfo.Id, // CreateBy = userInfo.Id,
CreateTime = DateTime.Now, // CreateTime = DateTime.Now,
CreateType = 1, // CreateType = 1,
Group_Id = userInfo.Group_Id, // Group_Id = userInfo.Group_Id,
LogContent = "首次生成订单，客户阶段由'" + (item.StuStage.ToName()) + "'自动转换为'" + (Common.Enum.User.StuStageEnum.Clinch.ToName()) + "'", // LogContent = "首次生成订单，客户阶段由'" + (item.StuStage.ToName()) + "'自动转换为'" + (Common.Enum.User.StuStageEnum.Clinch.ToName()) + "'",
LogTitle = "客户阶段变更", // LogTitle = "客户阶段变更",
LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo, // LogType = Common.Enum.Log.StudentLogTypeEnum.BasicInfo,
StuId = item.StuId // StuId = item.StuId
}); // });
} //}
#endregion #endregion
} }
} }
...@@ -2449,7 +2449,7 @@ namespace Edu.Module.Course ...@@ -2449,7 +2449,7 @@ namespace Edu.Module.Course
UpdateBy = dmodel.CreateBy, UpdateBy = dmodel.CreateBy,
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
CustomerId = ordermodel.CustomerId, CustomerId = ordermodel.CustomerId,
StuStage = Common.Enum.User.StuStageEnum.NewStu, StuStage = 1,
CreateType = Common.Enum.User.StuCreateTypeEnum.EmployeeInput CreateType = Common.Enum.User.StuCreateTypeEnum.EmployeeInput
}; };
studentRepository.SetStudentRepository(stuModel); studentRepository.SetStudentRepository(stuModel);
......
Edu.Module.Customer/CustomerModule.cs
View file @ 8dd982e2
...@@ -5,6 +5,7 @@ using Edu.Model.CacheModel; ...@@ -5,6 +5,7 @@ using Edu.Model.CacheModel;
using Edu.Model.ViewModel.Customer; using Edu.Model.ViewModel.Customer;
using Edu.Repository.Customer; using Edu.Repository.Customer;
using Edu.Repository.Log; using Edu.Repository.Log;
using Edu.Repository.System;
using Edu.Repository.User; using Edu.Repository.User;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -39,6 +40,11 @@ namespace Edu.Module.Customer ...@@ -39,6 +40,11 @@ namespace Edu.Module.Customer
/// </summary> /// </summary>
private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository(); private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
/// <summary>
/// 客户阶段仓储层对象
/// </summary>
private readonly RB_StageRepository stageRepository = new RB_StageRepository();
/// <summary> /// <summary>
/// 获取客户分页列表.. /// 获取客户分页列表..
...@@ -330,14 +336,18 @@ namespace Edu.Module.Customer ...@@ -330,14 +336,18 @@ namespace Edu.Module.Customer
{ {
List<object> RList = new List<object>(); List<object> RList = new List<object>();
var list = studentRepository.GetCustomerStuStageStatistics(customerId, group_Id); var list = studentRepository.GetCustomerStuStageStatistics(customerId, group_Id);
var elist = EnumHelper.EnumToList(typeof(Common.Enum.User.StuStageEnum)); var elist = stageRepository.GetStageListRepostory(new Model.Entity.System.RB_Stage()
{
Group_Id = group_Id
});
elist = elist.OrderBy(x => x.Id).ToList(); elist = elist.OrderBy(x => x.Id).ToList();
foreach (var item in elist) { foreach (var item in elist)
int Num = list.Where(x => x.StuStage == (Common.Enum.User.StuStageEnum)item.Id).FirstOrDefault()?.OrderCount ?? 0; {
int Num = list.Where(x => x.StuStage == item.Id).FirstOrDefault()?.OrderCount ?? 0;
RList.Add(new RList.Add(new
{ {
StuStage = item.Id, StuStage = item.Id,
StuStageName = item.Name, StuStageName = item.StageName,
StuNum = Num StuNum = Num
}); });
} }
......
Edu.Module.User/StudentModule.cs
View file @ 8dd982e2
...@@ -75,6 +75,11 @@ namespace Edu.Module.User ...@@ -75,6 +75,11 @@ namespace Edu.Module.User
/// </summary> /// </summary>
private readonly RB_Visitor_ReserveRepository visitor_ReserveRepository = new RB_Visitor_ReserveRepository(); private readonly RB_Visitor_ReserveRepository visitor_ReserveRepository = new RB_Visitor_ReserveRepository();
/// <summary>
/// 客户阶段仓储层对象
/// </summary>
private readonly RB_StageRepository stageRepository = new RB_StageRepository();
/// <summary> /// <summary>
/// 获取学生列表 /// 获取学生列表
/// </summary> /// </summary>
...@@ -95,9 +100,15 @@ namespace Edu.Module.User ...@@ -95,9 +100,15 @@ namespace Edu.Module.User
/// <returns></returns> /// <returns></returns>
public List<RB_Student_ViewModel> GetStudentPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_ViewModel query) 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); var list = studentRepository.GetStudentPageListRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
//客户阶段列表
var stageList = stageRepository.GetStageListRepostory(new Model.Entity.System.RB_Stage()
{
Group_Id = list[0].Group_Id
});
string stuIds = string.Join(",", list.Select(qitem => qitem.StuId)); 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 Model.ViewModel.Customer.RB_Student_Follow_Extend()
...@@ -211,6 +222,8 @@ namespace Edu.Module.User ...@@ -211,6 +222,8 @@ namespace Edu.Module.User
{ {
item.StuSourceIdName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == item.StuSourceId)?.CustomerName ?? ""; item.StuSourceIdName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == item.StuSourceId)?.CustomerName ?? "";
} }
item.StuStageName = stageList?.FirstOrDefault(qitem => qitem.Id == item.StuStage)?.StageName ?? "";
} }
} }
return list; return list;
...@@ -323,6 +336,7 @@ namespace Edu.Module.User ...@@ -323,6 +336,7 @@ namespace Edu.Module.User
StuId = extModel.StuId StuId = extModel.StuId
}); });
extModel.AssistList = assistList; extModel.AssistList = assistList;
extModel.StuStageName = stageRepository.GetEntity(extModel.StuStage)?.StageName ?? "";
} }
return extModel; return extModel;
} }
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ 8dd982e2
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Repository.Customer; using Edu.Repository.Customer;
using Edu.Repository.System;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -31,6 +32,11 @@ namespace Edu.Repository.User ...@@ -31,6 +32,11 @@ namespace Edu.Repository.User
/// </summary> /// </summary>
private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository(); private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository();
/// <summary>
/// 客户阶段仓储层对象
/// </summary>
private readonly RB_StageRepository stageRepository = new RB_StageRepository();
/// <summary> /// <summary>
/// 获取学生列表 /// 获取学生列表
/// </summary> /// </summary>
...@@ -296,7 +302,9 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an ...@@ -296,7 +302,9 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
} }
if (oldModel.StuStage != model.StuStage) if (oldModel.StuStage != model.StuStage)
{ {
logContent += string.Format("客户阶段：由【{0}】=>【{1}】,", oldModel.StuStage.ToName(), model.StuStage.ToName()); var oldName = stageRepository.GetEntity(oldModel.StuStage)?.StageName ?? "";
var newName = stageRepository.GetEntity(model.StuStage)?.StageName ?? "";
logContent += string.Format("客户阶段：由【{0}】=>【{1}】,", oldName, newName);
} }
if (oldModel.StuSource != model.StuSource) if (oldModel.StuSource != model.StuSource)
{ {
...@@ -352,7 +360,7 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an ...@@ -352,7 +360,7 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
{ {
if (model.StuStage <= 0) if (model.StuStage <= 0)
{ {
model.StuStage = Common.Enum.User.StuStageEnum.NewStu; model.StuStage = 1;
} }
var newId = base.Insert(model); var newId = base.Insert(model);
model.StuId = newId; model.StuId = newId;
......
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @ 8dd982e2
...@@ -482,7 +482,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -482,7 +482,7 @@ namespace Edu.WebApi.Controllers.Customer
} }
/// <summary> /// <summary>
/// 获取客户阶段 /// 获取客户阶段列表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
...@@ -496,6 +496,21 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -496,6 +496,21 @@ namespace Edu.WebApi.Controllers.Customer
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
} }
/// <summary>
/// 获取客户阶段下拉列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStageDropdownList()
{
var query = new RB_Stage()
{
Group_Id = base.UserInfo.Group_Id
};
var list = customerStudentModule.GetStageListModule(query);
return ApiResult.Success(data: list.Select(qitem => new { Id = qitem.Id, Name = qitem.StageName }));
}
/// <summary> /// <summary>
/// 新增修改客户阶段 /// 新增修改客户阶段
/// </summary> /// </summary>
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ 8dd982e2
...@@ -666,7 +666,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -666,7 +666,7 @@ namespace Edu.WebApi.Controllers.User
CreateBy = base.ParmJObj.GetInt("CreateBy"), CreateBy = base.ParmJObj.GetInt("CreateBy"),
IsQueryMyStu = base.ParmJObj.GetInt("IsQueryMyStu"), IsQueryMyStu = base.ParmJObj.GetInt("IsQueryMyStu"),
CustomerId = base.ParmJObj.GetInt("CustomerId"), CustomerId = base.ParmJObj.GetInt("CustomerId"),
StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage"), StuStage = base.ParmJObj.GetInt("StuStage"),
StartTime = base.ParmJObj.GetStringValue("StartTime"), StartTime = base.ParmJObj.GetStringValue("StartTime"),
EndTime = base.ParmJObj.GetStringValue("EndTime"), EndTime = base.ParmJObj.GetStringValue("EndTime"),
}; };
...@@ -704,7 +704,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -704,7 +704,7 @@ namespace Edu.WebApi.Controllers.User
StuSexStr = item.StuSex == 0 ? "男" : "女", StuSexStr = item.StuSex == 0 ? "男" : "女",
StuBirth = Common.ConvertHelper.FormatDate(item.StuBirth), StuBirth = Common.ConvertHelper.FormatDate(item.StuBirth),
item.StuStage, item.StuStage,
StuStageName = item.StuStage.ToName(), item.StuStageName,
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime), CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
item.CreateByName, item.CreateByName,
item.CreateType, item.CreateType,
...@@ -784,7 +784,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -784,7 +784,7 @@ namespace Edu.WebApi.Controllers.User
StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"), StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"), StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"), StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage"), StuStage = base.ParmJObj.GetInt("StuStage"),
StuChannel = (StuChannelEnum)base.ParmJObj.GetInt("StuChannel"), StuChannel = (StuChannelEnum)base.ParmJObj.GetInt("StuChannel"),
PlatformName = base.ParmJObj.GetStringValue("PlatformName"), PlatformName = base.ParmJObj.GetStringValue("PlatformName"),
CreateType=(StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"), CreateType=(StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
...@@ -892,12 +892,12 @@ namespace Edu.WebApi.Controllers.User ...@@ -892,12 +892,12 @@ namespace Edu.WebApi.Controllers.User
StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"), StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"), StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"), StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
StuStage = (StuStageEnum)base.ParmJObj.GetInt("StuStage"), StuStage =base.ParmJObj.GetInt("StuStage"),
}; };
extModel.CreateType = StuCreateTypeEnum.CustomerInput; extModel.CreateType = StuCreateTypeEnum.CustomerInput;
if (extModel.StuId == 0) if (extModel.StuId == 0)
{ {
extModel.StuStage = StuStageEnum.NewStu; extModel.StuStage =1;
} }
extModel.Status = DateStateEnum.Normal; extModel.Status = DateStateEnum.Normal;
extModel.StuStatus = 1; extModel.StuStatus = 1;
...@@ -1022,7 +1022,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -1022,7 +1022,7 @@ namespace Edu.WebApi.Controllers.User
extModel.CreateType, extModel.CreateType,
CreateTypeStr = extModel.CreateType.ToName(), CreateTypeStr = extModel.CreateType.ToName(),
extModel.StuStage, extModel.StuStage,
StuStageName = extModel.StuStage.ToName(), extModel.StuStageName,
extModel.CreateBy, extModel.CreateBy,
extModel.StuChannel, extModel.StuChannel,
StuChannelName = extModel.StuChannel.ToName(), StuChannelName = extModel.StuChannel.ToName(),
...@@ -1062,18 +1062,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -1062,18 +1062,6 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
} }
/// <summary>
/// 获取客户状态列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStuStageList()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(StuStageEnum));
return ApiResult.Success(data: list);
}
/// <summary> /// <summary>
/// 更新学生状态 /// 更新学生状态
/// </summary> /// </summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment