Skip to content

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

页面修改

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