Skip to content

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

页面修改

parent e1009575
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
Edu.Module.Customer/MarketConsultantModule.cs
View file @ d3f89b05
......@@ -622,7 +622,7 @@ namespace Edu.Module.Customer
//当前周
var curWeekList = lastList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)))?.ToList();
//上一周
var lastWeekList = lastList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1))-1)?.ToList();
var lastWeekList = lastList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)) - 1)?.ToList();
var tempDataList = lastList?.Where(qitem => Common.ConvertHelper.FormatDate(qitem.Date) == Common.ConvertHelper.FormatDate(end.AddDays(-1)))?.ToList();
......@@ -631,7 +631,7 @@ namespace Edu.Module.Customer
{
StartTime = StartTime,
EndTime = EndTime,
CreateIds=Common.ConvertHelper.StringToList(EmpIds)
CreateIds = Common.ConvertHelper.StringToList(EmpIds)
});
......@@ -649,15 +649,15 @@ namespace Edu.Module.Customer
barList.Add(new MarketChannelStaticModel()
{
ChannelId = sItem.StuChannel,
ChannelName = channelList?.FirstOrDefault(qitem=>qitem.Id==sItem.StuChannel)?.Name??"",
ClueCount = tempList?.Where(qitem=>qitem.StuChannel==sItem.StuChannel)?.Sum(qitem => qitem.ClueCount) ?? 0,
ChannelName = channelList?.FirstOrDefault(qitem => qitem.Id == sItem.StuChannel)?.Name ?? "",
ClueCount = tempList?.Where(qitem => qitem.StuChannel == sItem.StuChannel)?.Sum(qitem => qitem.ClueCount) ?? 0,
VisitCount = tempList?.Where(qitem => qitem.StuChannel == sItem.StuChannel)?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = tempList?.Where(qitem => qitem.StuChannel == sItem.StuChannel)?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = tempList?.Where(qitem => qitem.StuChannel == sItem.StuChannel)?.Sum(qitem => qitem.OrderIncome) ?? 0,
});
}
}
else if(item.CreateType== StuCreateTypeEnum.CustomerInput)
else if (item.CreateType == StuCreateTypeEnum.CustomerInput)
{
barList.Add(new MarketChannelStaticModel()
{
......@@ -757,7 +757,7 @@ namespace Edu.Module.Customer
},
BarData = new
{
ClueData = barList?.OrderByDescending(qitem => qitem.ClueCount)?.Select(qitem=>new { qitem.ChannelId,qitem.ChannelName,qitem.ClueCount})?.Take(10),
ClueData = barList?.OrderByDescending(qitem => qitem.ClueCount)?.Select(qitem => new { qitem.ChannelId, qitem.ChannelName, qitem.ClueCount })?.Take(10),
VisitData = barList?.OrderByDescending(qitem => qitem.VisitCount)?.Select(qitem => new { qitem.ChannelId, qitem.ChannelName, qitem.VisitCount })?.Take(10),
OrderData = barList?.OrderByDescending(qitem => qitem.OrderCount)?.Select(qitem => new { qitem.ChannelId, qitem.ChannelName, qitem.OrderCount })?.Take(10),
IncomeData = barList?.OrderByDescending(qitem => qitem.OrderIncome)?.Select(qitem => new { qitem.ChannelId, qitem.ChannelName, qitem.OrderIncome })?.Take(10),
......@@ -999,7 +999,7 @@ namespace Edu.Module.Customer
/// <param name="EndTime">结束时间</param>
/// <param name="qEmpIds">员工编号</param>
/// <returns></returns>
public List<object> MarketChannelStudentStaticModule(string StartTime, string EndTime, string qEmpIds,bool isHaveAuth=false)
public List<object> MarketChannelStudentStaticModule(string StartTime, string EndTime, string qEmpIds, bool isHaveAuth = false)
{
List<object> list = new List<object>();
var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
......@@ -1008,7 +1008,7 @@ namespace Edu.Module.Customer
QDeptIds = "4",
Group_Id = 100000,
IsLeave = 1,
QIds= qEmpIds
QIds = qEmpIds
});
if (empList != null && empList.Count > 0)
{
......@@ -1166,11 +1166,11 @@ namespace Edu.Module.Customer
customerDataList.Add(new MarketChannelStaticModel()
{
ChannelName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? "",
ChannelId= subItem.StuSourceId,
ClueCount = tempCusList?.Count()??0,
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount)??0,
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount)??0,
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome)??0
ChannelId = subItem.StuSourceId,
ClueCount = tempCusList?.Count() ?? 0,
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome) ?? 0
});
}
//校代同行
......@@ -1179,11 +1179,11 @@ namespace Edu.Module.Customer
schoolDataList.Add(new MarketChannelStaticModel()
{
ChannelName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? "",
ChannelId= subItem.StuSourceId,
ClueCount = tempCusList?.Count()??0,
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount)??0,
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount)??0,
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome)??0
ChannelId = subItem.StuSourceId,
ClueCount = tempCusList?.Count() ?? 0,
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = tempCusList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = tempCusList?.Sum(qitem => qitem.OrderIncome) ?? 0
});
}
}
......@@ -1207,11 +1207,11 @@ namespace Edu.Module.Customer
innerDataList.Add(new MarketChannelStaticModel()
{
ChannelName = empList?.FirstOrDefault(qitem => qitem.Id == sItem.StuSourceId)?.EmployeeName ?? "",
ChannelId= sItem.StuSourceId,
ClueCount = tempInnerList?.Count()??0,
VisitCount = tempInnerList?.Sum(qitem => qitem.VisitCount)??0,
OrderCount = tempInnerList?.Sum(qitem => qitem.OrderCount)??0,
OrderIncome = tempInnerList?.Sum(qitem => qitem.OrderIncome)??0
ChannelId = sItem.StuSourceId,
ClueCount = tempInnerList?.Count() ?? 0,
VisitCount = tempInnerList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = tempInnerList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = tempInnerList?.Sum(qitem => qitem.OrderIncome) ?? 0
});
}
}
......@@ -1232,11 +1232,11 @@ namespace Edu.Module.Customer
transDataList.Add(new MarketChannelStaticModel()
{
ChannelName = stuList?.FirstOrDefault(qitem => qitem.StuId == sItem.StuSourceId)?.StuName ?? "",
ChannelId= sItem.StuSourceId,
ClueCount = tempTransList?.Count()??0,
VisitCount = tempTransList?.Sum(qitem => qitem.VisitCount)??0,
OrderCount = tempTransList?.Sum(qitem => qitem.OrderCount)??0,
OrderIncome = tempTransList?.Sum(qitem => qitem.OrderIncome)??0
ChannelId = sItem.StuSourceId,
ClueCount = tempTransList?.Count() ?? 0,
VisitCount = tempTransList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = tempTransList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = tempTransList?.Sum(qitem => qitem.OrderIncome) ?? 0
});
}
}
......@@ -1306,7 +1306,7 @@ namespace Edu.Module.Customer
{
list.Add(new
{
ChannelName ="(企业)"+( customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? ""),
ChannelName = "(企业)" + (customerList?.FirstOrDefault(qitem => qitem.CustomerId == subItem.StuSourceId)?.CustomerName ?? ""),
subItem.StuSourceId,
ClueCount = tempCusList?.Count(),
VisitCount = tempCusList?.Sum(qitem => qitem.VisitCount),
......
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