Skip to content

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

页面修改

parent 237bd5ca
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
Edu.Module.Customer/MarketConsultantModule.cs
View file @ d6cc6d65
...@@ -1100,7 +1100,7 @@ namespace Edu.Module.Customer ...@@ -1100,7 +1100,7 @@ namespace Edu.Module.Customer
?.Select(qitem => new { qitem.Key.StuSourceId }); ?.Select(qitem => new { qitem.Key.StuSourceId });
foreach (var sItem in groupDataList) foreach (var sItem in groupDataList)
{ {
var tempInnerList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.StuSourceId == sItem.StuSourceId)?.ToList(); var tempInnerList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
innerDataList.Add(new MarketChannelStaticModel() innerDataList.Add(new MarketChannelStaticModel()
{ {
ChannelName = empList?.FirstOrDefault(qitem => qitem.Id == sItem.StuSourceId)?.EmployeeName ?? "", ChannelName = empList?.FirstOrDefault(qitem => qitem.Id == sItem.StuSourceId)?.EmployeeName ?? "",
...@@ -1120,12 +1120,12 @@ namespace Edu.Module.Customer ...@@ -1120,12 +1120,12 @@ namespace Edu.Module.Customer
{ {
stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { StuIds = stuIds }); stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { StuIds = stuIds });
} }
var sourceTypeList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction) var sourceTypeList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction)
?.GroupBy(qitem => new { qitem.StuSourceId }) ?.GroupBy(qitem => new { qitem.StuSourceId })
?.Select(qitem => new { qitem.Key.StuSourceId }); ?.Select(qitem => new { qitem.Key.StuSourceId });
foreach (var sItem in sourceTypeList) foreach (var sItem in sourceTypeList)
{ {
var tempTransList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList(); var tempTransList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
transDataList.Add(new MarketChannelStaticModel() transDataList.Add(new MarketChannelStaticModel()
{ {
ChannelName = stuList?.FirstOrDefault(qitem => qitem.StuId == sItem.StuSourceId)?.StuName ?? "", ChannelName = stuList?.FirstOrDefault(qitem => qitem.StuId == sItem.StuSourceId)?.StuName ?? "",
...@@ -1239,7 +1239,7 @@ namespace Edu.Module.Customer ...@@ -1239,7 +1239,7 @@ namespace Edu.Module.Customer
?.Select(qitem => new { qitem.Key.StuSourceId }); ?.Select(qitem => new { qitem.Key.StuSourceId });
foreach (var sItem in groupDataList) foreach (var sItem in groupDataList)
{ {
var tempInnerList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.StuSourceId == sItem.StuSourceId)?.ToList(); var tempInnerList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
list.Add(new list.Add(new
{ {
ChannelName = "(内部介绍)" + (empList?.FirstOrDefault(qitem => qitem.Id == sItem.StuSourceId)?.EmployeeName ?? ""), ChannelName = "(内部介绍)" + (empList?.FirstOrDefault(qitem => qitem.Id == sItem.StuSourceId)?.EmployeeName ?? ""),
...@@ -1257,12 +1257,12 @@ namespace Edu.Module.Customer ...@@ -1257,12 +1257,12 @@ namespace Edu.Module.Customer
{ {
stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { StuIds = stuIds }); stuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { StuIds = stuIds });
} }
var transTypeList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction) var transTypeList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction)
?.GroupBy(qitem => new { qitem.StuSourceId }) ?.GroupBy(qitem => new { qitem.StuSourceId })
?.Select(qitem => new { qitem.Key.StuSourceId }); ?.Select(qitem => new { qitem.Key.StuSourceId });
foreach (var sItem in transTypeList) foreach (var sItem in transTypeList)
{ {
var tempTransList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList(); var tempTransList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
list.Add(new list.Add(new
{ {
ChannelName = "(学员转介绍)" + stuList?.FirstOrDefault(qitem => qitem.StuId == sItem.StuSourceId)?.StuName ?? "", ChannelName = "(学员转介绍)" + stuList?.FirstOrDefault(qitem => qitem.StuId == sItem.StuSourceId)?.StuName ?? "",
......
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