Commit a44e05b8 authored by 黄奎's avatar 黄奎

查询修改

parent 28b86476
...@@ -799,58 +799,110 @@ namespace Edu.Module.Customer ...@@ -799,58 +799,110 @@ namespace Edu.Module.Customer
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(); var tempDataList = lastList?.Where(qitem => Common.ConvertHelper.FormatDate(qitem.Date) == Common.ConvertHelper.FormatDate(end.AddDays(-1)))?.ToList();
var TrialLessonCount = yesDataList?.Sum(qitem => qitem.TrialLessonCount) ?? 0;
var YestodayTrialLesson = yesDataList?.Sum(qitem => qitem.YestodayTrialLesson) ?? 0;
var CurWeekTrialLesson = curWeekList?.Sum(qitem => qitem.CurWeekTrialLesson) ?? 0;
var LastWeekTrialLesson = lastWeekList?.Sum(qitem => qitem.LastWeekTrialLesson) ?? 0;
var CurMonthTrialLesson = tempDataList?.Sum(qitem => qitem.CurMonthTrialLesson) ?? 0;
var LastMonthTrialLesson = tempDataList?.Sum(qitem => qitem.LastMonthTrialLesson) ?? 0;
var VisitCount = yesDataList?.Sum(qitem => qitem.VisitCount) ?? 0;
var YestodayVisit = yesDataList?.Sum(qitem => qitem.YestodayVisit) ?? 0;
var CurWeekVisit = curWeekList?.Sum(qitem => qitem.CurWeekVisit) ?? 0;
var LastWeekVisit = lastWeekList?.Sum(qitem => qitem.LastWeekVisit) ?? 0;
var CurMonthVisit = tempDataList?.Sum(qitem => qitem.CurMonthVisit) ?? 0;
var LastMonthVisit = tempDataList?.Sum(qitem => qitem.LastMonthVisit) ?? 0;
var Rates = yesDataList?.Sum(qitem => qitem.Rates) ?? 0;
var YestodayRates = yesDataList?.Sum(qitem => qitem.YestodayRates) ?? 0;
var CurWeekRates = curWeekList?.Sum(qitem => qitem.CurWeekRates) ?? 0;
var LastWeekRates = lastWeekList?.Sum(qitem => qitem.LastWeekRates) ?? 0;
var CurMonthRates = tempDataList?.Sum(qitem => qitem.CurMonthRates) ?? 0;
var LastMonthRates = tempDataList?.Sum(qitem => qitem.LastMonthRates) ?? 0;
var FollowCount = yesDataList?.Sum(qitem => qitem.FollowCount) ?? 0;
var YestodayFollow = yesDataList?.Sum(qitem => qitem.YestodayFollow) ?? 0;
var CurWeekFollow = curWeekList?.Sum(qitem => qitem.CurWeekFollow) ?? 0;
var LastWeekFollow = lastWeekList?.Sum(qitem => qitem.LastWeekFollow) ?? 0;
var CurMonthFollow = tempDataList?.Sum(qitem => qitem.CurMonthFollow) ?? 0;
var LastMonthFollow = tempDataList?.Sum(qitem => qitem.LastMonthFollow) ?? 0;
var AgFollow = Math.Round(yesDataList?.Average(qitem => qitem.AgFollow) ?? 0, 2);
var YestodayAgFollow = Math.Round(yesDataList?.Average(qitem => qitem.YestodayAgFollow) ?? 0, 2);
var CurWeekAgFollow = Math.Round(curWeekList?.Average(qitem => qitem.CurWeekAgFollow) ?? 0, 2);
var LastWeekAgFollow = Math.Round(lastWeekList?.Average(qitem => qitem.LastWeekAgFollow) ?? 0, 2);
decimal CurMonthAgFollow = 0;
decimal LastMonthAgFollow = 0;
if (tempDataList != null && tempDataList.Count > 0)
{
CurMonthAgFollow = Math.Round(tempDataList?.Average(qitem => qitem.CurMonthAgFollow) ?? 0, 2);
LastMonthAgFollow = Math.Round(tempDataList?.Average(qitem => qitem.LastMonthAgFollow) ?? 0, 2);
}
var CurWeekOrderNum = curWeekList?.Sum(qitem => qitem.CurWeekOrderNum) ?? 0;
var LastWeekOrderNum = lastWeekList?.Sum(qitem => qitem.LastWeekOrderNum) ?? 0;
var CurWeekOrderSale = tempDataList?.Sum(qitem => qitem.CurWeekOrderSale) ?? 0;
var LastWeekOrderSale = tempDataList?.Sum(qitem => qitem.LastWeekOrderSale) ?? 0;
var CurMonthOrderSale = tempDataList?.Sum(qitem => qitem.CurMonthOrderSale) ?? 0;
var LastMonthOrderSale = tempDataList?.Sum(qitem => qitem.LastMonthOrderSale) ?? 0;
var CurMonthOrderGoal = consultantGoal?.GoalMoney ?? 0;
var CurMonthOrderNum = tempDataList?.Sum(qitem => qitem.CurMonthOrderNum) ?? 0;
var LastMonthOrderNum = tempDataList?.Sum(qitem => qitem.LastMonthOrderNum) ?? 0;
obj = new obj = new
{ {
DayStr = Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)), DayStr = Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)),
WeekStr = Common.Plugin.StringHelper.GetWeek(end.AddDays(-1)), WeekStr = Common.Plugin.StringHelper.GetWeek(end.AddDays(-1)),
TrialLessonCount = yesDataList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
YestodayTrialLesson = yesDataList?.Sum(qitem => qitem.YestodayTrialLesson) ?? 0,
CurWeekTrialLesson = curWeekList?.Sum(qitem => qitem.CurWeekTrialLesson) ?? 0,
LastWeekTrialLesson = lastWeekList?.Sum(qitem => qitem.LastWeekTrialLesson) ?? 0,
CurMonthTrialLesson = tempDataList?.Sum(qitem => qitem.CurMonthTrialLesson) ?? 0,
LastMonthTrialLesson = tempDataList?.Sum(qitem => qitem.LastMonthTrialLesson) ?? 0,
VisitCount = yesDataList?.Sum(qitem => qitem.VisitCount) ?? 0,
YestodayVisit = yesDataList?.Sum(qitem => qitem.YestodayVisit) ?? 0,
CurWeekVisit = curWeekList?.Sum(qitem => qitem.CurWeekVisit) ?? 0,
LastWeekVisit = lastWeekList?.Sum(qitem => qitem.LastWeekVisit) ?? 0,
CurMonthVisit = tempDataList?.Sum(qitem => qitem.CurMonthVisit) ?? 0,
LastMonthVisit = tempDataList?.Sum(qitem => qitem.LastMonthVisit) ?? 0,
Rates = yesDataList?.Sum(qitem => qitem.Rates) ?? 0,
YestodayRates = yesDataList?.Sum(qitem => qitem.YestodayRates) ?? 0,
CurWeekRates = curWeekList?.Sum(qitem => qitem.CurWeekRates) ?? 0,
LastWeekRates = lastWeekList?.Sum(qitem => qitem.LastWeekRates) ?? 0,
CurMonthRates = tempDataList?.Sum(qitem => qitem.CurMonthRates) ?? 0,
LastMonthRates = tempDataList?.Sum(qitem => qitem.LastMonthRates) ?? 0,
FollowCount = yesDataList?.Sum(qitem => qitem.FollowCount) ?? 0,
YestodayFollow = yesDataList?.Sum(qitem => qitem.YestodayFollow) ?? 0,
CurWeekFollow = curWeekList?.Sum(qitem => qitem.CurWeekFollow) ?? 0,
LastWeekFollow = lastWeekList?.Sum(qitem => qitem.LastWeekFollow) ?? 0,
CurMonthFollow = tempDataList?.Sum(qitem => qitem.CurMonthFollow) ?? 0,
LastMonthFollow = tempDataList?.Sum(qitem => qitem.LastMonthFollow) ?? 0,
AgFollow = Math.Round(yesDataList?.Average(qitem => qitem.AgFollow) ?? 0, 2),
YestodayAgFollow = Math.Round(yesDataList?.Average(qitem => qitem.YestodayAgFollow) ?? 0, 2),
CurWeekAgFollow = Math.Round(curWeekList?.Average(qitem => qitem.CurWeekAgFollow) ?? 0, 2),
LastWeekAgFollow = Math.Round(lastWeekList?.Average(qitem => qitem.LastWeekAgFollow) ?? 0, 2),
CurMonthAgFollow = Math.Round(tempDataList?.Average(qitem => qitem.CurMonthAgFollow) ?? 0, 2),
LastMonthAgFollow = Math.Round(tempDataList?.Average(qitem => qitem.LastMonthAgFollow) ?? 0, 2),
CurWeekOrderNum = curWeekList?.Sum(qitem => qitem.CurWeekOrderNum) ?? 0,
LastWeekOrderNum = lastWeekList?.Sum(qitem => qitem.LastWeekOrderNum) ?? 0,
CurWeekOrderSale = tempDataList?.Sum(qitem => qitem.CurWeekOrderSale) ?? 0,
LastWeekOrderSale = tempDataList?.Sum(qitem => qitem.LastWeekOrderSale) ?? 0,
CurMonthOrderSale = tempDataList?.Sum(qitem => qitem.CurMonthOrderSale) ?? 0,
LastMonthOrderSale = tempDataList?.Sum(qitem => qitem.LastMonthOrderSale) ?? 0,
CurMonthOrderGoal = consultantGoal?.GoalMoney ?? 0,
CurMonthOrderNum = tempDataList?.Sum(qitem => qitem.CurMonthOrderNum) ?? 0,
LastMonthOrderNum = tempDataList?.Sum(qitem => qitem.LastMonthOrderNum) ?? 0,
TrialLessonCount,
YestodayTrialLesson,
CurWeekTrialLesson,
LastWeekTrialLesson,
CurMonthTrialLesson,
LastMonthTrialLesson,
VisitCount,
YestodayVisit,
CurWeekVisit,
LastWeekVisit,
CurMonthVisit,
LastMonthVisit,
Rates,
YestodayRates,
CurWeekRates,
LastWeekRates,
CurMonthRates,
LastMonthRates,
FollowCount,
YestodayFollow,
CurWeekFollow,
LastWeekFollow,
CurMonthFollow,
LastMonthFollow,
AgFollow,
YestodayAgFollow,
CurWeekAgFollow,
LastWeekAgFollow,
CurMonthAgFollow,
LastMonthAgFollow,
CurWeekOrderNum,
LastWeekOrderNum,
CurWeekOrderSale,
LastWeekOrderSale,
CurMonthOrderSale,
LastMonthOrderSale,
CurMonthOrderGoal,
CurMonthOrderNum,
LastMonthOrderNum,
}; };
return obj; return obj;
} }
...@@ -1043,10 +1095,10 @@ namespace Edu.Module.Customer ...@@ -1043,10 +1095,10 @@ namespace Edu.Module.Customer
{ {
ChannelName = item.Name, ChannelName = item.Name,
ChannelId = item.Id, ChannelId = item.Id,
ClueCount = channelTempList?.Count()??0, ClueCount = channelTempList?.Count() ?? 0,
VisitCount = channelTempList?.Sum(qitem => qitem.VisitCount)??0, VisitCount = channelTempList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = channelTempList?.Sum(qitem => qitem.OrderCount)??0, OrderCount = channelTempList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = channelTempList?.Sum(qitem => qitem.OrderIncome)??0 OrderIncome = channelTempList?.Sum(qitem => qitem.OrderIncome) ?? 0
}); });
} }
} }
...@@ -1057,10 +1109,10 @@ namespace Edu.Module.Customer ...@@ -1057,10 +1109,10 @@ namespace Edu.Module.Customer
{ {
ChannelName = "同行介绍", ChannelName = "同行介绍",
ChannelId = 10001, ChannelId = 10001,
ClueCount = customerList?.Count()??0, ClueCount = customerList?.Count() ?? 0,
VisitCount = customerList?.Sum(qitem => qitem.VisitCount)??0, VisitCount = customerList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = customerList?.Sum(qitem => qitem.OrderCount)??0, OrderCount = customerList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = customerList?.Sum(qitem => qitem.OrderIncome)??0 OrderIncome = customerList?.Sum(qitem => qitem.OrderIncome) ?? 0
}); });
var innerList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction)?.ToList(); var innerList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction)?.ToList();
...@@ -1068,10 +1120,10 @@ namespace Edu.Module.Customer ...@@ -1068,10 +1120,10 @@ namespace Edu.Module.Customer
{ {
ChannelName = "内部介绍", ChannelName = "内部介绍",
ChannelId = 10002, ChannelId = 10002,
ClueCount = innerList?.Count()??0, ClueCount = innerList?.Count() ?? 0,
VisitCount = innerList?.Sum(qitem => qitem.VisitCount)??0, VisitCount = innerList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = innerList?.Sum(qitem => qitem.OrderCount)??0, OrderCount = innerList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = innerList?.Sum(qitem => qitem.OrderIncome)??0 OrderIncome = innerList?.Sum(qitem => qitem.OrderIncome) ?? 0
}); });
var transList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction)?.ToList(); var transList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction)?.ToList();
...@@ -1079,10 +1131,10 @@ namespace Edu.Module.Customer ...@@ -1079,10 +1131,10 @@ namespace Edu.Module.Customer
{ {
ChannelName = "学员转介绍", ChannelName = "学员转介绍",
ChannelId = 10003, ChannelId = 10003,
ClueCount = transList?.Count()??0, ClueCount = transList?.Count() ?? 0,
VisitCount = transList?.Sum(qitem => qitem.VisitCount)??0, VisitCount = transList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = transList?.Sum(qitem => qitem.OrderCount)??0, OrderCount = transList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = transList?.Sum(qitem => qitem.OrderIncome)??0 OrderIncome = transList?.Sum(qitem => qitem.OrderIncome) ?? 0
}); });
var otherList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.EmployeeInput && !singleIds.Contains(qitem.StuChannel.ToString()))?.ToList(); var otherList = tempList?.Where(qitem => qitem.CreateType == StuCreateTypeEnum.EmployeeInput && !singleIds.Contains(qitem.StuChannel.ToString()))?.ToList();
...@@ -1090,23 +1142,23 @@ namespace Edu.Module.Customer ...@@ -1090,23 +1142,23 @@ namespace Edu.Module.Customer
{ {
ChannelName = "其他", ChannelName = "其他",
ChannelId = 10004, ChannelId = 10004,
ClueCount = otherList?.Count()??0, ClueCount = otherList?.Count() ?? 0,
VisitCount = otherList?.Sum(qitem => qitem.VisitCount)??0, VisitCount = otherList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = otherList?.Sum(qitem => qitem.OrderCount)??0, OrderCount = otherList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = otherList?.Sum(qitem => qitem.OrderIncome)??0 OrderIncome = otherList?.Sum(qitem => qitem.OrderIncome) ?? 0
}); });
subList.Add(new MarketChannelStaticModel() subList.Add(new MarketChannelStaticModel()
{ {
ChannelName = "合计", ChannelName = "合计",
ChannelId = 10005, ChannelId = 10005,
ClueCount = tempList?.Count()??0, ClueCount = tempList?.Count() ?? 0,
VisitCount = tempList?.Sum(qitem => qitem.VisitCount)??0, VisitCount = tempList?.Sum(qitem => qitem.VisitCount) ?? 0,
OrderCount = tempList?.Sum(qitem => qitem.OrderCount)??0, OrderCount = tempList?.Sum(qitem => qitem.OrderCount) ?? 0,
OrderIncome = tempList?.Sum(qitem => qitem.OrderIncome)??0 OrderIncome = tempList?.Sum(qitem => qitem.OrderIncome) ?? 0
}); });
Dictionary<string, object> dicList = new Dictionary<string, object>(); Dictionary<string, object> dicList = new Dictionary<string, object>();
for (var i = 0; i < subList.Count; i++) for (var i = 0; i < subList.Count; i++)
{ {
if (i == 0) if (i == 0)
...@@ -1122,10 +1174,11 @@ namespace Edu.Module.Customer ...@@ -1122,10 +1174,11 @@ namespace Edu.Module.Customer
dicList.Add(string.Format("ChannelName{0}", i), subList[i].ChannelName); dicList.Add(string.Format("ChannelName{0}", i), subList[i].ChannelName);
dicList.Add(string.Format("ClueCount{0}", i), subList[i].ClueCount); dicList.Add(string.Format("ClueCount{0}", i), subList[i].ClueCount);
dicList.Add(string.Format("VisitCount{0}", i), subList[i].VisitCount); dicList.Add(string.Format("VisitCount{0}", i), subList[i].VisitCount);
dicList.Add(string.Format("Rates{0}", i), rate+"%"); dicList.Add(string.Format("Rates{0}", i), rate + "%");
} }
list.Add(new { list.Add(new
{
eItem.Id, eItem.Id,
eItem.EmployeeName, eItem.EmployeeName,
dicList, dicList,
......
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