Skip to content

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

页面修改

parent dbaf668f
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 28 deletions
Edu.Module.Customer/MarketConsultantModule.cs
View file @ 043e0a73
......@@ -1023,22 +1023,46 @@ namespace Edu.Module.Customer
{
customerList= customerRepository.GetCustomerListRepository(new RB_Customer_Extend() { CustomerIds = cusIds });
}
var groupDataList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput)
var sourceTypeList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput)
?.GroupBy(qitem => new { qitem.CustomerSourceType })
?.Select(qitem => new { qitem.Key.CustomerSourceType });
foreach (var sItem in sourceTypeList)
{
var sourceIdList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.CustomerSourceType == sItem.CustomerSourceType)
?.GroupBy(qitem => new { qitem.StuSourceId })
?.Select(qitem => new { qitem.Key.StuSourceId });
foreach (var sItem in groupDataList)
foreach (var subItem in sourceIdList)
{
var tempCusList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.StuSourceId == subItem.StuSourceId)?.ToList();
//企业同行
if (sItem.CustomerSourceType == 1)
{
var tempCusList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
customerDataList.Add(new
{
ChannelName = customerList?.FirstOrDefault(qitem=>qitem.CustomerId==sItem.StuSourceId)?.CustomerName??"",
sItem.StuSourceId,
ChannelName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? "",
subItem.StuSourceId,
ClueCount = tempCusList?.Count(),
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount),
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount),
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome)
});
}
//校代同行
else if (sItem.CustomerSourceType == 2)
{
schoolDataList.Add(new
{
ChannelName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? "",
subItem.StuSourceId,
ClueCount = tempCusList?.Count(),
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount),
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount),
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome)
});
}
}
}
}
else if (item.Id == (int)StuCreateTypeEnum.InternalIntroduction)
......@@ -1054,15 +1078,15 @@ namespace Edu.Module.Customer
?.Select(qitem => new { qitem.Key.StuSourceId });
foreach (var sItem in groupDataList)
{
var tempCusList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
var tempInnerList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
innerDataList.Add(new
{
ChannelName = empList?.FirstOrDefault(qitem => qitem.Id == sItem.StuSourceId)?.EmployeeName ?? "",
sItem.StuSourceId,
ClueCount = tempCusList?.Count(),
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount),
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount),
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome)
ClueCount = tempInnerList?.Count(),
VisitCount = tempInnerList?.Sum(qitem => qitem.VisitCount),
OrderCount = tempInnerList?.Sum(qitem => qitem.OrderCount),
OrderIncome = tempInnerList?.Sum(qitem => qitem.OrderIncome)
});
}
}
......@@ -1079,15 +1103,15 @@ namespace Edu.Module.Customer
?.Select(qitem => new { qitem.Key.StuSourceId });
foreach (var sItem in sourceTypeList)
{
var tempCusList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
var tempTransList = dataList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction && qitem.StuSourceId == sItem.StuSourceId)?.ToList();
transDataList.Add(new
{
ChannelName = stuList?.FirstOrDefault(qitem => qitem.StuId == sItem.StuSourceId)?.StuName ?? "",
sItem.StuSourceId,
ClueCount = tempCusList?.Count(),
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount),
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount),
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome)
ClueCount = tempTransList?.Count(),
VisitCount = tempTransList?.Sum(qitem => qitem.VisitCount),
OrderCount = tempTransList?.Sum(qitem => qitem.OrderCount),
OrderIncome = tempTransList?.Sum(qitem => qitem.OrderIncome)
});
}
}
......@@ -1095,6 +1119,7 @@ namespace Edu.Module.Customer
return new
{
customerDataList,
schoolDataList,
innerDataList,
transDataList,
};
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ 043e0a73
......@@ -2767,7 +2767,7 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns>
[HttpPost]
[AllowRepeatAttribute]
public ApiResult MarketChannelStatic()
public ApiResult MarketChannelStudentStatic()
{
string startTime = base.ParmJObj.GetStringValue("startTime");
if (string.IsNullOrEmpty(startTime))
......
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