Skip to content

E
Education
Commit 2ec48eb7 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents b6f8d5ba 3ea80ea2
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 17 deletions
Edu.Model/Entity/Customer/RB_Student_Follow.cs
View file @ 2ec48eb7
......@@ -82,5 +82,15 @@ namespace Edu.Model.Entity.Customer
/// 意向度
/// </summary>
public int PurposeType { get; set; }
/// <summary>
/// 1-普通客户，2-留学客户
/// </summary>
public int StudentType { get; set; }
/// <summary>
///供应商ids 多选非必须
/// </summary>
public string SupplierIds { get; set; }
}
}
Edu.Model/ViewModel/Customer/RB_Student_Follow_Extend.cs
View file @ 2ec48eb7
......@@ -74,5 +74,11 @@ namespace Edu.Model.ViewModel.Customer
/// 学员负责人
/// </summary>
public int StuCreateBy { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public List<string> SupplierNameList { get; set; }
}
}
Edu.Model/ViewModel/StudyAbroad/RB_Supplier_ViewModel.cs
View file @ 2ec48eb7
......@@ -17,5 +17,11 @@ namespace Edu.Model.ViewModel.StudyAbroad
/// 修改人
/// </summary>
public string UpdateByName { get; set; }
/// <summary>
/// 查询多个供应商ids
/// </summary>
public string QIds { get; set; }
}
}
Edu.Module.Customer/CustomerStudentModule.cs
View file @ 2ec48eb7
......@@ -116,7 +116,10 @@ namespace Edu.Module.Customer
/// </summary>
private readonly RB_CourseRepository courseRepository = new RB_CourseRepository();
/// <summary>
/// 供应商仓储层对象
/// </summary>
private readonly RB_SupplierRepository supplierRepository = new RB_SupplierRepository();
#region 学员约访
/// <summary>
......@@ -292,15 +295,30 @@ namespace Edu.Module.Customer
string qCourseIds = string.Join(",", courseIdList);
courseList = GetCourseListModule(qCourseIds);
}
string supplierIds = string.Empty;
if (list.Any(x => !string.IsNullOrWhiteSpace(x.SupplierIds)))
{
supplierIds = string.Join(",", list.Where(x => !string.IsNullOrWhiteSpace(x.SupplierIds)).Select(x => x.SupplierIds));
}
List<RB_Supplier_ViewModel> supplierList = new List<RB_Supplier_ViewModel>();
if (!string.IsNullOrWhiteSpace(supplierIds))
{
supplierList = supplierRepository.GetSupplierListRepository(new RB_Supplier_ViewModel { QIds = supplierIds });
}
foreach (var item in list)
{
item.PurposeTypeName = "";
item.CourseNameList = new List<string>();
item.SupplierNameList = new List<string>();
if (item.PurposeType > 0)
{
item.PurposeTypeName = configList?.FirstOrDefault(qitem => qitem.Id == item.PurposeType)?.ConfigName ?? "";
}
if (!string.IsNullOrWhiteSpace(item.SupplierIds))
{
item.SupplierNameList = supplierList?.Where(x => item.SupplierIds.Contains(x.Id.ToString()))?.Select(x => x.Name)?.ToList() ?? new List<string>();
}
var tempIdList = Common.ConvertHelper.StringToList(item.ConsultCourseIds);
if (tempIdList != null && tempIdList.Count > 0)
{
......@@ -401,6 +419,28 @@ namespace Edu.Module.Customer
{
logContent += string.Format("下次回访时间：由【{0}】=>【{1}】", Common.ConvertHelper.FormatDate(oldModel.NextVisitDate), Common.ConvertHelper.FormatDate(model.NextVisitDate));
}
if (oldModel.SupplierIds != model.SupplierIds)
{
List<string> SupplierIdList = new List<string>();
if (!string.IsNullOrWhiteSpace(oldModel.SupplierIds))
{
SupplierIdList.AddRange(oldModel.SupplierIds.Split(","));
}
if (!string.IsNullOrWhiteSpace(model.SupplierIds))
{
SupplierIdList.AddRange(model.SupplierIds.Split(","));
}
string supplierIds = string.Join(",", SupplierIdList.Select(x => x));
List<RB_Supplier_ViewModel> supplierList = new List<RB_Supplier_ViewModel>();
if (!string.IsNullOrWhiteSpace(supplierIds))
{
supplierList = supplierRepository.GetSupplierListRepository(new RB_Supplier_ViewModel { QIds = supplierIds });
}
if (supplierList != null && supplierList.Any())
{
logContent += string.Format("供应商：由【{0}】=>【{1}】", !string.IsNullOrWhiteSpace(oldModel.SupplierIds) ? string.Join(",", supplierList.Where(x => oldModel.SupplierIds.Contains(x.Id.ToString()))?.Select(x => x.Name)) : "", !string.IsNullOrWhiteSpace(model.SupplierIds) ? string.Join(",", supplierList.Where(x => model.SupplierIds.Contains(x.Id.ToString()))?.Select(x => x.Name)) : "");
}
}
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_Follow_Extend.Remark),model.Remark },
......@@ -408,6 +448,7 @@ namespace Edu.Module.Customer
{nameof(RB_Student_Follow_Extend.ConsultKeyWords),model.ConsultKeyWords },
{nameof(RB_Student_Follow_Extend.NextVisitDate),model.NextVisitDate },
{nameof(RB_Student_Follow_Extend.PurposeType),model.PurposeType },
{nameof(RB_Student_Follow_Extend.SupplierIds),model.SupplierIds },
};
flag = student_FollowRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Follow_Extend.Id), model.Id));
logTitle = "修改跟进内容";
......@@ -496,9 +537,32 @@ namespace Edu.Module.Customer
{
logContent += string.Format("跟进内容：由【{0}】=>【{1}】", oldModel.Remark, model.Remark);
}
if (oldModel.SupplierIds != model.SupplierIds)
{
List<string> SupplierIdList = new List<string>();
if (!string.IsNullOrWhiteSpace(oldModel.SupplierIds))
{
SupplierIdList.AddRange(oldModel.SupplierIds.Split(","));
}
if (!string.IsNullOrWhiteSpace(model.SupplierIds))
{
SupplierIdList.AddRange(model.SupplierIds.Split(","));
}
string supplierIds = string.Join(",", SupplierIdList.Select(x => x));
List<RB_Supplier_ViewModel> supplierList = new List<RB_Supplier_ViewModel>();
if (!string.IsNullOrWhiteSpace(supplierIds))
{
supplierList = supplierRepository.GetSupplierListRepository(new RB_Supplier_ViewModel { QIds = supplierIds });
}
if (supplierList != null && supplierList.Any())
{
logContent += string.Format("供应商：由【{0}】=>【{1}】", !string.IsNullOrWhiteSpace(oldModel.SupplierIds) ? string.Join(",", supplierList.Where(x => oldModel.SupplierIds.Contains(x.Id.ToString()))?.Select(x => x.Name)) : "", !string.IsNullOrWhiteSpace(model.SupplierIds) ? string.Join(",", supplierList.Where(x => model.SupplierIds.Contains(x.Id.ToString()))?.Select(x => x.Name)) : "");
}
}
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Student_Follow_Extend.Remark),model.Remark },
{nameof(RB_Student_Follow_Extend.SupplierIds),model.SupplierIds },
{nameof(RB_Student_Follow_Extend.PurposeType),model.PurposeType },
{nameof(RB_Student_Follow_Extend.ConsultCourseIds),model.ConsultCourseIds },
{nameof(RB_Student_Follow_Extend.ConsultKeyWords),model.ConsultKeyWords },
......@@ -578,8 +642,8 @@ namespace Edu.Module.Customer
var oldModel = studentRepository.GetEntity<RB_Student_ViewModel>(model.StuId);
if (oldModel.StuPurpose != StuPurpose)
{
string oldName =!string.IsNullOrWhiteSpace(oldModel.StuPurpose)?( string.Join(",", learningGoalsRepository.GetLearningGoalsListRepository(new RB_LearningGoals_Extend { QGoalIds = oldModel.StuPurpose })?.Select(x => x.Name)) ?? ""):"";
string newName = !string.IsNullOrWhiteSpace(StuPurpose) ? (string.Join(",", learningGoalsRepository.GetLearningGoalsListRepository(new RB_LearningGoals_Extend { QGoalIds = StuPurpose })?.Select(x => x.Name)) ?? ""): "";
string oldName = !string.IsNullOrWhiteSpace(oldModel.StuPurpose) ? (string.Join(",", learningGoalsRepository.GetLearningGoalsListRepository(new RB_LearningGoals_Extend { QGoalIds = oldModel.StuPurpose })?.Select(x => x.Name)) ?? "") : "";
string newName = !string.IsNullOrWhiteSpace(StuPurpose) ? (string.Join(",", learningGoalsRepository.GetLearningGoalsListRepository(new RB_LearningGoals_Extend { QGoalIds = StuPurpose })?.Select(x => x.Name)) ?? "") : "";
logContent += string.Format("学习目的：由【{0}】=>【{1}】,", oldName, newName);
}
if (oldModel.StuProfession != StuProfession)
......
Edu.Repository/Customer/RB_Student_FollowRepository.cs
View file @ 2ec48eb7
......@@ -42,6 +42,10 @@ FROM RB_Student_Follow AS A INNER JOIN rb_student AS stu ON A.StuId=stu.StuId
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Follow_Extend.StuId), query.StuId);
}
if (query.StudentType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Follow_Extend.StudentType), query.StudentType);
}
if (!string.IsNullOrEmpty(query.STime))
{
builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Student_Follow_Extend.CreateTime), query.STime);
......
Edu.Repository/StudyAbroad/RB_SupplierRepository.cs
View file @ 2ec48eb7
......@@ -50,7 +50,7 @@ WHERE 1=1
}
if (query.Type > 0)
{
builder.AppendFormat(" AND A.{0}={1}", nameof(RB_Supplier_ViewModel.Type),(int)query.Type);
builder.AppendFormat(" AND A.{0}={1}", nameof(RB_Supplier_ViewModel.Type), (int)query.Type);
}
return GetPage<RB_Supplier_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
......@@ -65,11 +65,7 @@ WHERE 1=1
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Supplier AS A
WHERE 1=1
");
builder.AppendFormat(@" SELECT A.* FROM RB_Supplier AS A WHERE 1=1 ");
builder.AppendFormat(" AND A.{0}={1}", nameof(RB_Supplier_ViewModel.Status), (int)DateStateEnum.Normal);
if (query == null)
{
......@@ -81,6 +77,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1}", nameof(RB_Supplier_ViewModel.Group_Id), query.Group_Id);
}
if (!string.IsNullOrWhiteSpace(query.QIds))
{
builder.AppendFormat(" AND A.{0} in ({1})", nameof(RB_Supplier_ViewModel.Id), query.QIds);
}
if (!string.IsNullOrEmpty(query.Name))
{
builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Supplier_ViewModel.Name));
......
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @ 2ec48eb7
......@@ -141,6 +141,7 @@ namespace Edu.WebApi.Controllers.Customer
StuId = base.ParmJObj.GetInt("StuId"),
STime = base.ParmJObj.GetStringValue("STime"),
ETime = base.ParmJObj.GetStringValue("ETime"),
StudentType = base.ParmJObj.GetInt("StudentType",1),
};
query.Group_Id = base.UserInfo.Group_Id;
var data = customerStudentModule.GetStudentFollowPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
......@@ -154,14 +155,18 @@ namespace Edu.WebApi.Controllers.Customer
item.StuId,
item.Remark,
item.CreateBy,
SupplierName = string.Join("、", item.SupplierNameList),
item.SupplierIds,
item.SupplierNameList,
CreateTime = Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
CreateByName,
item.PurposeType,
item.PurposeTypeName,
CourseName=string.Join("、", item.CourseNameList),
CourseName = string.Join("、", item.CourseNameList),
item.ConsultCourseIds,
ConsultCourseIdList=Common.ConvertHelper.StringToList(item.ConsultCourseIds),
ConsultCourseIdList = Common.ConvertHelper.StringToList(item.ConsultCourseIds),
item.ConsultKeyWords,
item.StudentType,
NextVisitDate = Common.ConvertHelper.FormatDate(item.NextVisitDate)
});
}
......@@ -186,6 +191,8 @@ namespace Edu.WebApi.Controllers.Customer
ConsultKeyWords = base.ParmJObj.GetStringValue("ConsultKeyWords"),
NextVisitDate = base.ParmJObj.GetDateTime("NextVisitDate"),
ConsultCourseIds = "",
SupplierIds = base.ParmJObj.GetStringValue("SupplierIds"),
StudentType= base.ParmJObj.GetInt("StudentType",1),
};
string consultCourseIdListStr = base.ParmJObj.GetStringValue("ConsultCourseIdList");
if (!string.IsNullOrEmpty(consultCourseIdListStr))
......@@ -193,7 +200,7 @@ namespace Edu.WebApi.Controllers.Customer
try
{
var tempIdList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(consultCourseIdListStr);
extModel.ConsultCourseIds=string.Join(",", tempIdList);
extModel.ConsultCourseIds = string.Join(",", tempIdList);
}
catch (Exception ex)
{
......@@ -223,11 +230,13 @@ namespace Edu.WebApi.Controllers.Customer
{
Id = base.ParmJObj.GetInt("Id"),
StuId = base.ParmJObj.GetInt("StuId"),
ConsultCourseIds=base.ParmJObj.GetStringValue("ConsultCourseIds"),
ConsultKeyWords=base.ParmJObj.GetStringValue("ConsultKeyWords"),
NextVisitDate=base.ParmJObj.GetDateTime("NextVisitDate"),
PurposeType=base.ParmJObj.GetInt("PurposeType"),
ConsultCourseIds = base.ParmJObj.GetStringValue("ConsultCourseIds"),
ConsultKeyWords = base.ParmJObj.GetStringValue("ConsultKeyWords"),
NextVisitDate = base.ParmJObj.GetDateTime("NextVisitDate"),
PurposeType = base.ParmJObj.GetInt("PurposeType"),
Remark = base.ParmJObj.GetStringValue("Remark"),
SupplierIds = base.ParmJObj.GetStringValue("SupplierIds"),
StudentType = base.ParmJObj.GetInt("StudentType",1),
};
string StuProfession = base.ParmJObj.GetStringValue("StuProfession");
string StuPurpose = base.ParmJObj.GetStringValue("StuPurpose");
......@@ -1089,7 +1098,7 @@ namespace Edu.WebApi.Controllers.Customer
[HttpPost]
public ApiResult TestPush()
{
var flag= customerStudentModule.PushStudentFollowUpModule();
var flag = customerStudentModule.PushStudentFollowUpModule();
return ApiResult.Success(data: flag);
}
}
......
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