Skip to content

E
Education
Commit 2326923c authored by 吴春's avatar 吴春
Browse files
Options

1

parent d676f12d
Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 19 deletions
Edu.Module.Customer/CustomerStudentModule.cs
View file @ 2326923c
......@@ -164,7 +164,8 @@ namespace Edu.Module.Customer
flag = newId > 0;
logTitle = "新增学员约访";
logContent = model.Remark;
if (flag) {
if (flag)
{
//增加 跟进记录
#region 验证用户的类型
var assistList = student_AssistRepository.GetStudentAssistListRepository(new RB_Student_Assist_Extend() { StuId = model.StuId });
......@@ -180,7 +181,7 @@ namespace Edu.Module.Customer
CreateTime = model.CreateTime,
Group_Id = model.Group_Id,
Id = 0,
Remark = $"客人约访：约访时间【{ Common.ConvertHelper.FormatTimeStr2(model.AppointmentTime)}】，约访地点【{model.AppointmentPoint}】，备注【{model.Remark}】",
Remark = $"客人约访：约访时间【{Common.ConvertHelper.FormatTimeStr2(model.AppointmentTime)}】，约访地点【{model.AppointmentPoint}】，备注【{model.Remark}】",
Status = DateStateEnum.Normal,
UpdateBy = model.UpdateBy,
UpdateTime = model.UpdateTime
......@@ -351,6 +352,124 @@ namespace Edu.Module.Customer
}
/// <summary>
/// 新增修改学员跟进
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetStudentBaseInfoModule(RB_Student_Follow_Extend model, string StuProfession, int StuPurpose)
{
bool flag = false;
string logContent = "";
string logTitle = "";
if (!string.IsNullOrWhiteSpace(model.Remark))
{
var assistList = student_AssistRepository.GetStudentAssistListRepository(new RB_Student_Assist_Extend() { StuId = model.StuId });
if (model.Id > 0)
{
var oldModel = GetStudentFollowModule(model.Id);
if (oldModel.Remark != model.Remark)
{
logContent += string.Format("跟进内容：由【{0}】=>【{1}】", oldModel.Remark, model.Remark);
}
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_Follow_Extend.Remark),model.Remark }
};
flag = student_FollowRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Follow_Extend.Id), model.Id));
logTitle = "修改跟进内容";
}
else
{
#region 验证用户的类型
var assistModel = assistList.Where(x => x.AssistId == model.CreateBy).FirstOrDefault();
model.AssistType = assistModel?.AssistType ?? 0;
#endregion
var newId = student_FollowRepository.Insert(model);
model.Id = newId;
flag = newId > 0;
logTitle = "新增跟进";
logContent = model.Remark;
}
try
{
var smodel = studentRepository.GetEntity(model.StuId);
string markdownContent = $"`学员跟进通知` \n>**概要信息** \n>学员名称：{smodel?.StuName ?? ""}\n>跟进内容：{model.Remark} \n>";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.B2BCustomerStu,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "新增学员跟进通知",
Platform = 5,
};
if (smodel != null && smodel.CreateBy > 0)
{
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(smodel.CreateBy);
if (!string.IsNullOrEmpty(queryTargetWorkId))
{
modelWork.ReceiveId = queryTargetWorkId;
List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}
}
if (assistList != null && assistList.Count > 0)
{
foreach (var item in assistList)
{
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(item.AssistId);
if (!string.IsNullOrEmpty(queryTargetWorkId))
{
modelWork.ReceiveId = queryTargetWorkId;
List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}
}
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetStudentFollowModule");
}
if (!string.IsNullOrWhiteSpace(logContent))
{
student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.Follow, logTitle, logContent, model.CreateBy);
}
}
if (model.StuId > 0)
{
logContent = "";
logTitle = "修改客户";
var oldModel = studentRepository.GetEntity<RB_Student_ViewModel>(model.StuId);
if (oldModel.StuPurpose != StuPurpose)
{
string oldName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(oldModel.StuPurpose)?.Name ?? "";
string newName = learningGoalsRepository.GetLearningGoalsExtEntityRepository(StuPurpose)?.Name ?? "";
logContent += string.Format("学习目的：由【{0}】=>【{1}】,", oldName, newName);
}
if (oldModel.StuProfession != StuProfession)
{
logContent += string.Format("职业：由【{0}】=>【{1}】,", oldModel.StuProfession, StuProfession);
}
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_ViewModel.StuPurpose),StuPurpose},
{nameof(RB_Student_ViewModel.StuProfession),StuProfession},
};
flag = studentRepository.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StuId));
student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.BasicInfo, logTitle, logContent, model.CreateBy, CreateType: 1);
}
return flag;
}
/// <summary>
/// 根据编号获取学员跟进信息
......@@ -725,7 +844,7 @@ namespace Edu.Module.Customer
{nameof(RB_Student_Assist_Extend.AssistType),model.AssistType },
{nameof(RB_Student_Assist_Extend.AssistId),model.AssistId },
};
if (oldModel!=null&&oldModel.AssistId != model.AssistId)
if (oldModel != null && oldModel.AssistId != model.AssistId)
{
logContent += string.Format("修改协同人员：【{0}】=>【{1}】",
empList?.FirstOrDefault(qitem => qitem.Id == (oldModel?.AssistId ?? 0))?.EmployeeName,
......@@ -747,7 +866,7 @@ namespace Edu.Module.Customer
var stuAssistList = student_AssistRepository.GetStudentAssistListRepository(new RB_Student_Assist_Extend() { StuId = StuId });
if (stuAssistList != null && stuAssistList.Count > 0)
{
var stuModel= studentRepository.GetEntity(StuId);
var stuModel = studentRepository.GetEntity(StuId);
var empModel = accountRepository.GetEmployeeInfo(Uid);
foreach (var item in stuAssistList)
{
......@@ -837,7 +956,7 @@ namespace Edu.Module.Customer
/// <param name="studIds"></param>
/// <param name="uid"></param>
/// <returns></returns>
public (bool result, string msg) SetStudentAssistBatchModule(string studIds,int uid)
public (bool result, string msg) SetStudentAssistBatchModule(string studIds, int uid)
{
//语培推送配置
var pushKey = "PUSH_STU_UNION_EMP";
......@@ -852,7 +971,7 @@ namespace Edu.Module.Customer
var stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { StuIds = studIds.TrimStart(',').TrimEnd(',') });
var push = dicList.Where(qitem => qitem.DictKey == pushKey).FirstOrDefault();
var rule = dicList.Where(qitem => qitem.DictKey == pushRule).FirstOrDefault();
var study= dicList.Where(qitem => qitem.DictKey == studyabroad).FirstOrDefault();
var study = dicList.Where(qitem => qitem.DictKey == studyabroad).FirstOrDefault();
var mask = string.Empty;
if (stuList != null && stuList.Count > 0)
{
......@@ -875,13 +994,13 @@ namespace Edu.Module.Customer
foreach (var jItem in jArray)
{
JObject sObj = JObject.Parse(jItem.ToString());
if (!isExists&& sObj.GetStringValue("Code").Contains(item.StuNeeds.ToString()))
if (!isExists && sObj.GetStringValue("Code").Contains(item.StuNeeds.ToString()))
{
isExists = true;
tempItem = new RB_Dictvalue_Extend()
{
Content= sObj.GetStringValue("Content"),
Mask= sObj.GetStringValue("Mask"),
Content = sObj.GetStringValue("Content"),
Mask = sObj.GetStringValue("Mask"),
};
}
}
......@@ -916,7 +1035,7 @@ namespace Edu.Module.Customer
/// <param name="model"></param>
/// <param name="uid"></param>
/// <returns></returns>
private string PushStudyManagerModule(RB_Dictvalue_Extend study, RB_Student_Assist_Extend model,int uid)
private string PushStudyManagerModule(RB_Dictvalue_Extend study, RB_Student_Assist_Extend model, int uid)
{
string mask = "";
var idArray = Common.ConvertHelper.StringToList(study.Content);
......@@ -938,7 +1057,7 @@ namespace Edu.Module.Customer
/// <param name="model"></param>
/// <param name="uid"></param>
/// <param name="mask"></param>
private string PushCourseManagerModule(RB_Dictvalue_Extend push, RB_Dictvalue_Extend rule, RB_Student_Assist_Extend model,int uid)
private string PushCourseManagerModule(RB_Dictvalue_Extend push, RB_Dictvalue_Extend rule, RB_Student_Assist_Extend model, int uid)
{
string mask = "";
var guwen = push.Content.Split(',', StringSplitOptions.RemoveEmptyEntries);
......@@ -1378,7 +1497,8 @@ namespace Edu.Module.Customer
}
};
bool flag = studentRepository.Update(keyValues, wheres);
if (flag) {
if (flag)
{
student_LogRepository.Insert(new Model.Entity.Customer.RB_Student_Log()
{
LogId = 0,
......
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @ 2326923c
using Edu.Cache.User;
using Edu.Common.API;
using Edu.Common.Enum.Course;
using Edu.Common.Enum.User;
using Edu.Common.Plugin;
using Edu.Model.Entity.System;
......@@ -184,6 +185,32 @@ namespace Edu.WebApi.Controllers.Customer
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 新增修改学员跟进
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetStudentBaseInfo()
{
var extModel = new RB_Student_Follow_Extend()
{
Id = base.ParmJObj.GetInt("Id"),
StuId = base.ParmJObj.GetInt("StuId"),
Remark = base.ParmJObj.GetStringValue("Remark"),
};
string StuProfession = base.ParmJObj.GetStringValue("StuProfession");
int StuPurpose = base.ParmJObj.GetInt("StuPurpose");
extModel.CreateBy = base.UserInfo.Id;
extModel.CreateTime = DateTime.Now;
extModel.UpdateBy = base.UserInfo.Id;
extModel.UpdateTime = DateTime.Now;
extModel.Group_Id = base.UserInfo.Group_Id;
bool flag = customerStudentModule.SetStudentBaseInfoModule(extModel, StuProfession, StuPurpose);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <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