Commit a27c1b6f authored by 黄奎's avatar 黄奎

页面修改

parent 55becc4e
...@@ -22,69 +22,34 @@ namespace Edu.Model.Entity.Customer ...@@ -22,69 +22,34 @@ namespace Edu.Model.Entity.Customer
/// </summary> /// </summary>
public int StuId { get; set; } public int StuId { get; set; }
/// <summary>
/// 期望达成日期
/// </summary>
public string ExpectDate { get; set; }
/// <summary>
/// 胜率
/// </summary>
public decimal? WinRate { get; set; }
/// <summary> /// <summary>
/// 跟进状态 /// 跟进状态
/// </summary> /// </summary>
public int? AdvisorStatus { get; set; } public int AdvisorStatus { get; set; }
/// <summary>
/// 疑似日期
/// </summary>
public string SuspectedDate { get; set; }
/// <summary>
/// 疑似备注
/// </summary>
public string SuspectedRemark { get; set; }
/// <summary>
/// 潜在日期
/// </summary>
public string PotentialDate { get; set; }
/// <summary>
/// 潜在备注
/// </summary>
public string PotentialRemark { get; set; }
/// <summary>
/// 接近日期
/// </summary>
public string NearDate { get; set; }
/// <summary> /// <summary>
/// 接近备注 /// 跟进日期
/// </summary> /// </summary>
public string NearRemark { get; set; } public string AdvisorDate { get; set; }
/// <summary> /// <summary>
/// 谈判时间 /// 跟进备注
/// </summary> /// </summary>
public string NegotiationDate { get; set; } public string AdvisorRemark { get; set; }
/// <summary> /// <summary>
/// 谈判备注 /// 创建人
/// </summary> /// </summary>
public string NegotiationRemark { get; set; } public int CreateBy { get; set; }
/// <summary> /// <summary>
/// 达成协议时间 /// 创建时间
/// </summary> /// </summary>
public string ReachDate { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 达成协议备注 /// 集团编号
/// </summary> /// </summary>
public string ReachRemark { get; set; } public int Group_Id { get; set; }
} }
} }
...@@ -251,5 +251,20 @@ namespace Edu.Model.Entity.User ...@@ -251,5 +251,20 @@ namespace Edu.Model.Entity.User
/// 首次报名时间 /// 首次报名时间
/// </summary> /// </summary>
public DateTime? FirstEnrollDate { get; set; } public DateTime? FirstEnrollDate { get; set; }
/// <summary>
/// 课程顾问跟进状态
/// </summary>
public int AdvisorStatus { get; set; }
/// <summary>
/// 课程顾问胜率
/// </summary>
public decimal AdvisorWinRate { get; set; }
/// <summary>
/// 课程顾问期望达成协议日期
/// </summary>
public string AdvisorExpectDate { get; set; }
} }
} }
...@@ -14,5 +14,20 @@ namespace Edu.Model.ViewModel.Customer ...@@ -14,5 +14,20 @@ namespace Edu.Model.ViewModel.Customer
/// 学员编号 /// 学员编号
/// </summary> /// </summary>
public string QStuIds { get; set; } public string QStuIds { get; set; }
/// <summary>
/// 跟进状态名称
/// </summary>
public string AdvisorStatusName { get; set; }
/// <summary>
/// 跟进状态完成百分比
/// </summary>
public decimal AdvisorRate { get; set; }
/// <summary>
/// 课程顾问期望达成协议日期
/// </summary>
public string AdvisorExpectDate { get; set; }
} }
} }
...@@ -169,6 +169,7 @@ namespace Edu.Module.Customer ...@@ -169,6 +169,7 @@ namespace Edu.Module.Customer
var assistModel = assistList.Where(x => x.AssistId == model.CreateBy).FirstOrDefault(); var assistModel = assistList.Where(x => x.AssistId == model.CreateBy).FirstOrDefault();
var AssistType = assistModel?.AssistType ?? 0; var AssistType = assistModel?.AssistType ?? 0;
#endregion #endregion
student_FollowRepository.Insert(new Model.Entity.Customer.RB_Student_Follow() student_FollowRepository.Insert(new Model.Entity.Customer.RB_Student_Follow()
{ {
StuId = model.StuId, StuId = model.StuId,
...@@ -177,7 +178,7 @@ namespace Edu.Module.Customer ...@@ -177,7 +178,7 @@ namespace Edu.Module.Customer
CreateTime = model.CreateTime, CreateTime = model.CreateTime,
Group_Id = model.Group_Id, Group_Id = model.Group_Id,
Id = 0, Id = 0,
Remark = $"客人约访:约访时间【{model.AppointmentTime.ToString("yyyy-MM-dd HH:mm")}】,约访地点【{model.AppointmentPoint}】,备注【{model.Remark}】", Remark = $"客人约访:约访时间【{ Common.ConvertHelper.FormatTimeStr2(model.AppointmentTime)}】,约访地点【{model.AppointmentPoint}】,备注【{model.Remark}】",
Status = DateStateEnum.Normal, Status = DateStateEnum.Normal,
UpdateBy = model.UpdateBy, UpdateBy = model.UpdateBy,
UpdateTime = model.UpdateTime UpdateTime = model.UpdateTime
......
...@@ -350,7 +350,7 @@ namespace Edu.Module.User ...@@ -350,7 +350,7 @@ namespace Edu.Module.User
OperatorEnum = OperatorEnum.NotEqual OperatorEnum = OperatorEnum.NotEqual
}); });
} }
var NewId= studentRepository.Exists("StuId", where); var NewId = studentRepository.Exists("StuId", where);
return NewId > 0; return NewId > 0;
} }
...@@ -404,9 +404,9 @@ namespace Edu.Module.User ...@@ -404,9 +404,9 @@ namespace Edu.Module.User
Common.Message.MessageHelper.SendMessage(modelWork); Common.Message.MessageHelper.SendMessage(modelWork);
} }
} }
} }
return flag; return flag;
} }
...@@ -469,15 +469,17 @@ namespace Edu.Module.User ...@@ -469,15 +469,17 @@ namespace Edu.Module.User
extModel.StuPurposeName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(extModel.StuPurpose)?.Name ?? ""; extModel.StuPurposeName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(extModel.StuPurpose)?.Name ?? "";
extModel.StuChannelName = channelRepository.GetChannelExtEntityRepository(extModel.StuChannel)?.Name ?? ""; extModel.StuChannelName = channelRepository.GetChannelExtEntityRepository(extModel.StuChannel)?.Name ?? "";
extModel.StuNeedsName = needsRepository.GetNeedsExtEntityRepository(extModel.StuNeeds)?.Name ?? ""; extModel.StuNeedsName = needsRepository.GetNeedsExtEntityRepository(extModel.StuNeeds)?.Name ?? "";
if (extModel.CustomerId > 0) //if (extModel.CustomerId > 0)
{ //{
extModel.CustomerName = customerRepository.GetEntity(extModel.CustomerId)?.CustomerName ?? ""; // extModel.CustomerName = customerRepository.GetEntity(extModel.CustomerId)?.CustomerName ?? "";
} //}
if (extModel.StuSourceId>0) if (extModel.StuSourceId > 0)
{ {
if (extModel.CreateType == StuCreateTypeEnum.CustomerInput) if (extModel.CreateType == StuCreateTypeEnum.CustomerInput)
{ {
extModel.StuSourceIdName = customerRepository.GetEntity(extModel.StuSourceId)?.CustomerName ?? ""; var customerName = customerRepository.GetEntity(extModel.StuSourceId)?.CustomerName ?? "";
extModel.StuSourceIdName = customerName;
extModel.CustomerName = customerName;
} }
else if (extModel.CreateType == StuCreateTypeEnum.EmployeeInput) else if (extModel.CreateType == StuCreateTypeEnum.EmployeeInput)
{ {
...@@ -617,8 +619,6 @@ namespace Edu.Module.User ...@@ -617,8 +619,6 @@ namespace Edu.Module.User
} }
#endregion #endregion
/// <summary> /// <summary>
/// 根据学生id获取同班账户,必须是未开班/学习中的 /// 根据学生id获取同班账户,必须是未开班/学习中的
/// </summary> /// </summary>
...@@ -629,8 +629,6 @@ namespace Edu.Module.User ...@@ -629,8 +629,6 @@ namespace Edu.Module.User
return studentRepository.GetListByStudentId(Student_Id, Group_Id); return studentRepository.GetListByStudentId(Student_Id, Group_Id);
} }
/// <summary> /// <summary>
/// 根据学生id获取学生的班级课程学校信息 /// 根据学生id获取学生的班级课程学校信息
/// </summary> /// </summary>
...@@ -679,7 +677,7 @@ namespace Edu.Module.User ...@@ -679,7 +677,7 @@ namespace Edu.Module.User
Title = "同业查重通知", Title = "同业查重通知",
Platform = 5, Platform = 5,
}; };
if (customerModel!=null&&customerModel.CreateBy > 0) if (customerModel != null && customerModel.CreateBy > 0)
{ {
var queryTargetWorkId = accountModule.GetWorkUserIdModule(customerModel.CreateBy); var queryTargetWorkId = accountModule.GetWorkUserIdModule(customerModel.CreateBy);
modelWork.ReceiveId = queryTargetWorkId; modelWork.ReceiveId = queryTargetWorkId;
...@@ -722,16 +720,16 @@ namespace Edu.Module.User ...@@ -722,16 +720,16 @@ namespace Edu.Module.User
var addList = studentRepository.GetStudentStaticRepository(createBy.ToString(), startDate, today); var addList = studentRepository.GetStudentStaticRepository(createBy.ToString(), startDate, today);
int days = (DateTime.Now - startTime).Days; int days = (DateTime.Now - startTime).Days;
List<object> dayList = new List<object>(); List<object> dayList = new List<object>();
//今日新增名单 //今日新增名单
int todayAdd = addList?.FirstOrDefault(qitem=>Common.ConvertHelper.FormatDate(qitem.CreateTime)== today)?.ClueCount ?? 0; int todayAdd = addList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == today)?.ClueCount ?? 0;
//到访名单 //到访名单
var visitList = student_VisitRepository.GetStudentVisitStaticRepository(new RB_Student_Visit_Extend() var visitList = student_VisitRepository.GetStudentVisitStaticRepository(new RB_Student_Visit_Extend()
{ {
CreateBy = createBy, CreateBy = createBy,
StartDate = startDate, StartDate = startDate,
EndDate= today EndDate = today
}); });
//今日到访 //今日到访
int todayVisit = visitList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == today)?.VisitCount ?? 0; int todayVisit = visitList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == today)?.VisitCount ?? 0;
...@@ -761,7 +759,7 @@ namespace Edu.Module.User ...@@ -761,7 +759,7 @@ namespace Edu.Module.User
{ {
CreateBy = createBy, CreateBy = createBy,
StartClassDate = startDate, StartClassDate = startDate,
EndClassDate=today EndClassDate = today
}); });
//今日试听 //今日试听
var trialLessonCount = trialLessonList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == today)?.TrialLessonCount ?? 0; var trialLessonCount = trialLessonList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == today)?.TrialLessonCount ?? 0;
...@@ -783,7 +781,7 @@ namespace Edu.Module.User ...@@ -783,7 +781,7 @@ namespace Edu.Module.User
VisitCount = visitList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.VisitCount ?? 0, VisitCount = visitList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.VisitCount ?? 0,
appointmentCount = appointmentList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.AppointmentCount ?? 0, appointmentCount = appointmentList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.AppointmentCount ?? 0,
customerCount = customerList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.CustomerCount ?? 0, customerCount = customerList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.CustomerCount ?? 0,
trialLessonCount=trialLessonList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.TrialLessonCount ?? 0, trialLessonCount = trialLessonList?.FirstOrDefault(qitem => Common.ConvertHelper.FormatDate(qitem.CreateTime) == Common.ConvertHelper.FormatDate(newDate))?.TrialLessonCount ?? 0,
}); });
} }
...@@ -823,7 +821,8 @@ namespace Edu.Module.User ...@@ -823,7 +821,8 @@ namespace Edu.Module.User
{ {
//获取正在学习的课程 //获取正在学习的课程
var model = student_OrderGuestRepository.GetLearningCourseInfo(accountId, group_Id, 1); var model = student_OrderGuestRepository.GetLearningCourseInfo(accountId, group_Id, 1);
if (model == null) { if (model == null)
{
model = student_OrderGuestRepository.GetLearningCourseInfo(accountId, group_Id, 2); model = student_OrderGuestRepository.GetLearningCourseInfo(accountId, group_Id, 2);
} }
return model; return model;
...@@ -833,7 +832,7 @@ namespace Edu.Module.User ...@@ -833,7 +832,7 @@ namespace Edu.Module.User
public void UpdateTel() public void UpdateTel()
{ {
var list= studentRepository.GetStudentListRepository(new RB_Student_ViewModel()); var list = studentRepository.GetStudentListRepository(new RB_Student_ViewModel());
foreach (var item in list) foreach (var item in list)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
...@@ -875,7 +874,8 @@ namespace Edu.Module.User ...@@ -875,7 +874,8 @@ namespace Edu.Module.User
{ {
logContent += $"咨询结果由【{oldModel.ConsultingResults}】修改为【{demodel.ConsultingResults}】;"; logContent += $"咨询结果由【{oldModel.ConsultingResults}】修改为【{demodel.ConsultingResults}】;";
} }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Student_ViewModel.ConsultDate), demodel.ConsultDate}, { nameof(RB_Student_ViewModel.ConsultDate), demodel.ConsultDate},
{ nameof(RB_Student_ViewModel.PlanPrice), demodel.PlanPrice}, { nameof(RB_Student_ViewModel.PlanPrice), demodel.PlanPrice},
{ nameof(RB_Student_ViewModel.BaseCondition), demodel.BaseCondition}, { nameof(RB_Student_ViewModel.BaseCondition), demodel.BaseCondition},
...@@ -885,15 +885,18 @@ namespace Edu.Module.User ...@@ -885,15 +885,18 @@ namespace Edu.Module.User
{ nameof(RB_Student_ViewModel.UpdateBy), userInfo.Id}, { nameof(RB_Student_ViewModel.UpdateBy), userInfo.Id},
{ nameof(RB_Student_ViewModel.UpdateTime), DateTime.Now} { nameof(RB_Student_ViewModel.UpdateTime), DateTime.Now}
}; };
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 = demodel.StuId, FiledValue = demodel.StuId,
OperatorEnum =OperatorEnum.Equal OperatorEnum =OperatorEnum.Equal
} }
}; };
bool flag = studentRepository.Update(keyValues, wheres); bool flag = studentRepository.Update(keyValues, wheres);
if (flag) { if (flag)
{
student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log() student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
{ {
LogId = 0, LogId = 0,
...@@ -910,7 +913,7 @@ namespace Edu.Module.User ...@@ -910,7 +913,7 @@ namespace Edu.Module.User
return flag ? "" : "出错了,请联系管理员"; return flag ? "" : "出错了,请联系管理员";
} }
#region #region 课程顾问跟进管理
/// <summary> /// <summary>
/// 获取课程顾问跟进配置分页列表 /// 获取课程顾问跟进配置分页列表
...@@ -931,7 +934,7 @@ namespace Edu.Module.User ...@@ -931,7 +934,7 @@ namespace Edu.Module.User
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Student_AdvisorConfig_Extend> GetStudentAdvisorConfigListRepository(RB_Student_AdvisorConfig_Extend query) public List<RB_Student_AdvisorConfig_Extend> GetStudentAdvisorConfigListModule(RB_Student_AdvisorConfig_Extend query)
{ {
var list = student_AdvisorConfigRepository.GetStudentAdvisorConfigListRepository(query); var list = student_AdvisorConfigRepository.GetStudentAdvisorConfigListRepository(query);
return list; return list;
...@@ -954,6 +957,7 @@ namespace Edu.Module.User ...@@ -954,6 +957,7 @@ namespace Edu.Module.User
{nameof(RB_Student_AdvisorConfig_Extend.Num),model.Num }, {nameof(RB_Student_AdvisorConfig_Extend.Num),model.Num },
{nameof(RB_Student_AdvisorConfig_Extend.UpdateBy),model.UpdateBy }, {nameof(RB_Student_AdvisorConfig_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Student_AdvisorConfig_Extend.UpdateTime),model.UpdateTime }, {nameof(RB_Student_AdvisorConfig_Extend.UpdateTime),model.UpdateTime },
{nameof(RB_Student_AdvisorConfig_Extend.Rate),model.Rate },
}; };
flag = student_AdvisorConfigRepository.Update(fileds, new WhereHelper(nameof(RB_Student_AdvisorConfig_Extend.Id), model.Id)); flag = student_AdvisorConfigRepository.Update(fileds, new WhereHelper(nameof(RB_Student_AdvisorConfig_Extend.Id), model.Id));
} }
...@@ -1001,7 +1005,7 @@ namespace Edu.Module.User ...@@ -1001,7 +1005,7 @@ namespace Edu.Module.User
/// <param name="rowsCount"></param> /// <param name="rowsCount"></param>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Student_Advisor_Extend> GetStudentAdvisorPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Student_Advisor_Extend query) public List<RB_Student_Advisor_Extend> GetStudentAdvisorPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_Advisor_Extend query)
{ {
var list = student_AdvisorRepository.GetStudentAdvisorPageRepository(pageIndex, pageSize, out rowsCount, query); var list = student_AdvisorRepository.GetStudentAdvisorPageRepository(pageIndex, pageSize, out rowsCount, query);
return list; return list;
...@@ -1012,7 +1016,7 @@ namespace Edu.Module.User ...@@ -1012,7 +1016,7 @@ namespace Edu.Module.User
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Student_Advisor_Extend> GetStudentAdvisorListRepository(RB_Student_Advisor_Extend query) public List<RB_Student_Advisor_Extend> GetStudentAdvisorListModule(RB_Student_Advisor_Extend query)
{ {
var list = student_AdvisorRepository.GetStudentAdvisorListRepository(query); var list = student_AdvisorRepository.GetStudentAdvisorListRepository(query);
return list; return list;
...@@ -1026,24 +1030,28 @@ namespace Edu.Module.User ...@@ -1026,24 +1030,28 @@ namespace Edu.Module.User
public bool SetStudentAdvisorModule(RB_Student_Advisor_Extend model) public bool SetStudentAdvisorModule(RB_Student_Advisor_Extend model)
{ {
bool flag = false; bool flag = false;
var oldStudent = studentRepository.GetEntity<RB_Student_ViewModel>(model.StuId);
if (oldStudent != null)
{
Dictionary<string, object> stuFileds = new Dictionary<string, object>()
{
{nameof(RB_Student_ViewModel.AdvisorStatus),model.AdvisorStatus },
{nameof(RB_Student_ViewModel.AdvisorWinRate),model.AdvisorRate },
};
if (string.IsNullOrEmpty(oldStudent.AdvisorExpectDate))
{
stuFileds.Add(nameof(RB_Student_ViewModel.AdvisorExpectDate), model.AdvisorExpectDate);
}
flag = studentRepository.Update(stuFileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StuId));
}
if (model.Id > 0) if (model.Id > 0)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Student_Advisor_Extend.StuId),model.StuId }, {nameof(RB_Student_Advisor_Extend.StuId),model.StuId },
{nameof(RB_Student_Advisor_Extend.ExpectDate),model.ExpectDate },
{nameof(RB_Student_Advisor_Extend.WinRate),model.WinRate },
{nameof(RB_Student_Advisor_Extend.AdvisorStatus),model.AdvisorStatus }, {nameof(RB_Student_Advisor_Extend.AdvisorStatus),model.AdvisorStatus },
{nameof(RB_Student_Advisor_Extend.SuspectedDate),model.SuspectedDate }, {nameof(RB_Student_Advisor_Extend.AdvisorDate),model.AdvisorDate },
{nameof(RB_Student_Advisor_Extend.SuspectedRemark),model.SuspectedRemark }, {nameof(RB_Student_Advisor_Extend.AdvisorRemark),model.AdvisorRemark },
{nameof(RB_Student_Advisor_Extend.PotentialDate),model.PotentialDate },
{nameof(RB_Student_Advisor_Extend.PotentialRemark),model.PotentialRemark },
{nameof(RB_Student_Advisor_Extend.NearDate),model.NearDate },
{nameof(RB_Student_Advisor_Extend.NearRemark),model.NearRemark },
{nameof(RB_Student_Advisor_Extend.NegotiationDate),model.NegotiationDate },
{nameof(RB_Student_Advisor_Extend.NegotiationRemark),model.NegotiationRemark },
{nameof(RB_Student_Advisor_Extend.ReachDate),model.ReachDate },
{nameof(RB_Student_Advisor_Extend.ReachRemark),model.ReachRemark },
}; };
flag = student_AdvisorRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Advisor_Extend.Id), model.Id)); flag = student_AdvisorRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Advisor_Extend.Id), model.Id));
} }
......
...@@ -34,6 +34,10 @@ WHERE 1=1 ...@@ -34,6 +34,10 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_AdvisorConfig_Extend.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_AdvisorConfig_Extend.Status), (int)DateStateEnum.Normal);
if (query != null) if (query != null)
{ {
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_AdvisorConfig_Extend.Group_Id), query.Group_Id);
}
if (!string.IsNullOrEmpty(query.Name)) if (!string.IsNullOrEmpty(query.Name))
{ {
builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Student_AdvisorConfig_Extend.Name)); builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Student_AdvisorConfig_Extend.Name));
...@@ -61,6 +65,10 @@ WHERE 1=1 ...@@ -61,6 +65,10 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_AdvisorConfig_Extend.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_AdvisorConfig_Extend.Status), (int)DateStateEnum.Normal);
if (query != null) if (query != null)
{ {
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_AdvisorConfig_Extend.Group_Id), query.Group_Id);
}
if (!string.IsNullOrEmpty(query.Name)) if (!string.IsNullOrEmpty(query.Name))
{ {
builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Student_AdvisorConfig_Extend.Name)); builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Student_AdvisorConfig_Extend.Name));
......
...@@ -24,8 +24,8 @@ namespace Edu.Repository.Customer ...@@ -24,8 +24,8 @@ namespace Edu.Repository.Customer
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* SELECT A.*,B.Name AS AdvisorStatusName,B.Rate AS AdvisorRate
FROM RB_Student_Advisor AS A FROM RB_Student_Advisor AS A LEFT JOIN rb_student_advisorconfig AS B ON A.AdvisorStatus=B.Id
WHERE 1=1 WHERE 1=1
"); ");
if (query != null) if (query != null)
...@@ -52,8 +52,8 @@ WHERE 1=1 ...@@ -52,8 +52,8 @@ WHERE 1=1
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* SELECT A.*,B.Name AS AdvisorStatusName,B.Rate AS AdvisorRate
FROM RB_Student_Advisor AS A FROM RB_Student_Advisor AS A LEFT JOIN rb_student_advisorconfig AS B ON A.AdvisorStatus=B.Id
WHERE 1=1 WHERE 1=1
"); ");
if (query != null) if (query != null)
......
...@@ -1493,19 +1493,21 @@ namespace Edu.WebApi.Controllers.User ...@@ -1493,19 +1493,21 @@ namespace Edu.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetStudentConsultResults() { public ApiResult SetStudentConsultResults()
{
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
RB_Student_ViewModel demodel = JsonHelper.DeserializeObject<RB_Student_ViewModel>(base.RequestParm.Msg.ToString()); RB_Student_ViewModel demodel = JsonHelper.DeserializeObject<RB_Student_ViewModel>(base.RequestParm.Msg.ToString());
if (demodel.StuId <= 0) { if (demodel.StuId <= 0)
{
return ApiResult.ParamIsNull("请传递学员ID"); return ApiResult.ParamIsNull("请传递学员ID");
} }
string msg = studentModule.SetStudentConsultResults(demodel, userInfo); string msg = studentModule.SetStudentConsultResults(demodel, userInfo);
if (msg == "") if (msg == "")
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(msg); return ApiResult.Failed(msg);
} }
} }
...@@ -2277,10 +2279,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -2277,10 +2279,6 @@ namespace Edu.WebApi.Controllers.User
var flag = departmentModule.RemoveDepartmentModule(DeptId, Status, token); var flag = departmentModule.RemoveDepartmentModule(DeptId, Status, token);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#endregion #endregion
#region 岗位管理 #region 岗位管理
...@@ -2552,6 +2550,195 @@ namespace Edu.WebApi.Controllers.User ...@@ -2552,6 +2550,195 @@ namespace Edu.WebApi.Controllers.User
var flag = managerModule.SetEmployeeTypeModule(targetAccountType, AccountId, AccountType, Remark, base.UserInfo); var flag = managerModule.SetEmployeeTypeModule(targetAccountType, AccountId, AccountType, Remark, base.UserInfo);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#endregion
#region 课程顾问跟进学员信息
/// <summary>
/// 获取课程顾问跟进配置分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentAdvisorConfigPage()
{
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_AdvisorConfig_Extend()
{
Group_Id = base.UserInfo.Group_Id,
Name = base.ParmJObj.GetStringValue("Name")
};
var list=studentModule.GetStudentAdvisorConfigPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> result = new List<object>();
foreach (var item in list)
{
string Name = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
result.Add(new
{
item.Id,
item.Name,
item.Num,
item.Rate,
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
CreateByName = Name
});
}
pageModel.Count = rowsCount;
pageModel.PageData = result;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取课程顾问跟进配置列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentAdvisorConfigList()
{
var query = new RB_Student_AdvisorConfig_Extend()
{
Group_Id = base.UserInfo.Group_Id,
Name = base.ParmJObj.GetStringValue("Name")
};
var list = studentModule.GetStudentAdvisorConfigListModule(query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 新增修改课程顾问配置
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetStudentAdvisorConfig()
{
var model = new RB_Student_AdvisorConfig_Extend()
{
Id = base.ParmJObj.GetInt("Id"),
Name = base.ParmJObj.GetStringValue("Name"),
Num = base.ParmJObj.GetInt("Num"),
Rate = base.ParmJObj.GetDecimal("Rate"),
};
model.CreateBy = base.UserInfo.Id;
model.UpdateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now;
model.UpdateTime = DateTime.Now;
model.Group_Id = base.UserInfo.Group_Id;
model.Status = DateStateEnum.Normal;
bool flag = studentModule.SetStudentAdvisorConfigModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据编号获取课程顾问配置信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentAdvisorConfig()
{
var Id = base.ParmJObj.GetInt("Id");
var extModel = studentModule.GetStudentAdvisorConfigModule(Id);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 根据编号删除课程顾问配置信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult RemoveStudentAdvisorConfig()
{
var Id = base.ParmJObj.GetInt("Id");
bool flag = studentModule.RemoveStudentAdvisorConfigModule(Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取课程顾问跟进分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentAdvisorPage()
{
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_Advisor_Extend()
{
StuId = base.ParmJObj.GetInt("StuId"),
};
List<object> result = new List<object>();
var list = studentModule.GetStudentAdvisorPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
{
string Name = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
result.Add(new
{
item.Id,
item.StuId,
item.AdvisorStatusName,
item.AdvisorDate,
item.AdvisorRemark,
item.AdvisorStatus,
item.AdvisorRate,
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
CreateByName = Name
});
}
pageModel.Count = rowsCount;
pageModel.PageData = result;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取课程顾问跟进列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentAdvisorList()
{
var query = new RB_Student_Advisor_Extend()
{
StuId = base.ParmJObj.GetInt("StuId"),
};
var list = studentModule.GetStudentAdvisorListModule(query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 新增修改课程顾问跟进记录
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetStudentAdvisor()
{
var model = new RB_Student_Advisor_Extend()
{
Id = base.ParmJObj.GetInt("Id"),
StuId = base.ParmJObj.GetInt("StuId"),
AdvisorStatus = base.ParmJObj.GetInt("AdvisorStatus"),
AdvisorDate = base.ParmJObj.GetStringValue("AdvisorDate"),
AdvisorRemark = base.ParmJObj.GetStringValue("AdvisorRemark"),
AdvisorExpectDate=base.ParmJObj.GetStringValue("AdvisorExpectDate"),
AdvisorRate=base.ParmJObj.GetDecimal("AdvisorRate"),
};
model.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now;
model.Group_Id = base.UserInfo.Group_Id;
bool flag = studentModule.SetStudentAdvisorModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据编号获取课程顾问跟进记录
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentAdvisor()
{
var Id = base.ParmJObj.GetInt("Id");
var extModel = studentModule.GetStudentAdvisorModule(Id);
return ApiResult.Success(data: extModel);
}
#endregion #endregion
} }
} }
\ No newline at end of file
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