Skip to content

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

页面修改

parent 417eafd3
Show whitespace changes
Inline Side-by-side
Showing with 262 additions and 95 deletions
Edu.Module.User/StudentStatModule.cs
View file @ 88cd5864
...@@ -1638,45 +1638,45 @@ namespace Edu.Module.User ...@@ -1638,45 +1638,45 @@ namespace Edu.Module.User
firstModel = i < list.Count ? list[i - 1] : new RB_Student_Static_Extend(); firstModel = i < list.Count ? list[i - 1] : new RB_Student_Static_Extend();
} }
var item = i < list.Count ? list[i] : new RB_Student_Static_Extend(); var item = i < list.Count ? list[i] : new RB_Student_Static_Extend();
if (item.PushCount > 0 && i > 0) if (firstModel.PushCount > 0 && i > 0)
{ {
PushCount = (item.PushCount - firstModel.PushCount) / item.PushCount * 100; PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100;
} }
decimal NewCount = 0; decimal NewCount = 0;
if (item.NewCount > 0 && i > 0) if (firstModel.NewCount > 0 && i > 0)
{ {
NewCount = (item.NewCount - firstModel.NewCount) / item.NewCount * 100; NewCount = (item.NewCount - firstModel.NewCount) / firstModel.NewCount * 100;
} }
decimal CommunicationCount = 0; decimal CommunicationCount = 0;
if (item.CommunicationCount > 0 && i > 0) if (firstModel.CommunicationCount > 0 && i > 0)
{ {
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / item.CommunicationCount * 100; CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / firstModel.CommunicationCount * 100;
} }
decimal TrialLessonCount = 0; decimal TrialLessonCount = 0;
if (item.TrialLessonCount > 0 && i > 0) if (firstModel.TrialLessonCount > 0 && i > 0)
{ {
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / item.TrialLessonCount * 100; TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100;
} }
decimal NotContacted = 0; decimal NotContacted = 0;
if (item.NotContacted > 0 && i > 0) if (firstModel.NotContacted > 0 && i > 0)
{ {
NotContacted = (item.NotContacted - firstModel.NotContacted) / item.NotContacted * 100; NotContacted = (item.NotContacted - firstModel.NotContacted) / firstModel.NotContacted * 100;
} }
decimal JPCount = 0; decimal JPCount = 0;
if (item.JPCount > 0 && i > 0) if (firstModel.JPCount > 0 && i > 0)
{ {
JPCount = (item.JPCount - firstModel.JPCount) / item.JPCount * 100; JPCount = (item.JPCount - firstModel.JPCount) / firstModel.JPCount * 100;
} }
decimal KRCount = 0; decimal KRCount = 0;
if (item.KRCount > 0 && i > 0) if (firstModel.KRCount > 0 && i > 0)
{ {
KRCount = (item.KRCount - firstModel.KRCount) / item.KRCount * 100; KRCount = (item.KRCount - firstModel.KRCount) / firstModel.KRCount * 100;
} }
decimal FRCount = 0; decimal FRCount = 0;
if (item.FRCount > 0 && i > 0) if (firstModel.FRCount > 0 && i > 0)
{ {
FRCount = (item.FRCount - firstModel.FRCount) / item.FRCount * 100; FRCount = (item.FRCount - firstModel.FRCount) / firstModel.FRCount * 100;
} }
decimal JPStudyCount = 0; decimal JPStudyCount = 0;
if (item.JPStudyCount > 0 && i > 0) if (item.JPStudyCount > 0 && i > 0)
...@@ -1684,64 +1684,64 @@ namespace Edu.Module.User ...@@ -1684,64 +1684,64 @@ namespace Edu.Module.User
JPStudyCount = (item.JPStudyCount - firstModel.JPStudyCount) / item.JPStudyCount * 100; JPStudyCount = (item.JPStudyCount - firstModel.JPStudyCount) / item.JPStudyCount * 100;
} }
decimal KRStudyCount = 0; decimal KRStudyCount = 0;
if (item.KRStudyCount > 0 && i > 0) if (firstModel.KRStudyCount > 0 && i > 0)
{ {
KRStudyCount = (item.KRStudyCount - firstModel.KRStudyCount) / item.KRStudyCount * 100; KRStudyCount = (item.KRStudyCount - firstModel.KRStudyCount) / firstModel.KRStudyCount * 100;
} }
decimal YGAStudyCount = 0; decimal YGAStudyCount = 0;
if (item.YGAStudyCount > 0 && i > 0) if (firstModel.YGAStudyCount > 0 && i > 0)
{ {
YGAStudyCount = (item.YGAStudyCount - firstModel.YGAStudyCount) / item.YGAStudyCount * 100; YGAStudyCount = (item.YGAStudyCount - firstModel.YGAStudyCount) / firstModel.YGAStudyCount * 100;
} }
decimal USStudyCount = 0; decimal USStudyCount = 0;
if (item.USStudyCount > 0 && i > 0) if (firstModel.USStudyCount > 0 && i > 0)
{ {
USStudyCount = (item.USStudyCount - firstModel.USStudyCount) / item.USStudyCount * 100; USStudyCount = (item.USStudyCount - firstModel.USStudyCount) / firstModel.USStudyCount * 100;
} }
decimal SGStudyCount = 0; decimal SGStudyCount = 0;
if (item.SGStudyCount > 0 && i > 0) if (firstModel.SGStudyCount > 0 && i > 0)
{ {
SGStudyCount = (item.SGStudyCount - firstModel.SGStudyCount) / item.SGStudyCount * 100; SGStudyCount = (item.SGStudyCount - firstModel.SGStudyCount) / firstModel.SGStudyCount * 100;
} }
decimal AXStudyCount = 0; decimal AXStudyCount = 0;
if (item.AXStudyCount > 0 && i > 0) if (firstModel.AXStudyCount > 0 && i > 0)
{ {
AXStudyCount = (item.AXStudyCount - firstModel.AXStudyCount) / item.AXStudyCount * 100; AXStudyCount = (item.AXStudyCount - firstModel.AXStudyCount) / firstModel.AXStudyCount * 100;
} }
decimal OtherCount = 0; decimal OtherCount = 0;
if (item.OtherCount > 0 && i > 0) if (firstModel.OtherCount > 0 && i > 0)
{ {
OtherCount = (item.OtherCount - firstModel.OtherCount) / item.OtherCount * 100; OtherCount = (item.OtherCount - firstModel.OtherCount) / firstModel.OtherCount * 100;
} }
decimal ClassACount = 0; decimal ClassACount = 0;
if (item.ClassACount > 0 && i > 0) if (firstModel.ClassACount > 0 && i > 0)
{ {
ClassACount = (item.ClassACount - firstModel.ClassACount) / item.ClassACount * 100; ClassACount = (item.ClassACount - firstModel.ClassACount) / firstModel.ClassACount * 100;
} }
decimal ClassBCount = 0; decimal ClassBCount = 0;
if (item.ClassBCount > 0 && i > 0) if (firstModel.ClassBCount > 0 && i > 0)
{ {
ClassBCount = (item.ClassBCount - firstModel.ClassBCount) / item.ClassBCount * 100; ClassBCount = (item.ClassBCount - firstModel.ClassBCount) / firstModel.ClassBCount * 100;
} }
decimal ClassCCount = 0; decimal ClassCCount = 0;
if (item.ClassCCount > 0) if (firstModel.ClassCCount > 0)
{ {
ClassCCount = (item.ClassCCount - firstModel.ClassCCount) / item.ClassCCount * 100; ClassCCount = (item.ClassCCount - firstModel.ClassCCount) / firstModel.ClassCCount * 100;
} }
decimal ClassDCount = 0; decimal ClassDCount = 0;
if (item.ClassDCount > 0 && i > 0) if (firstModel.ClassDCount > 0 && i > 0)
{ {
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / item.ClassDCount * 100; ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100;
} }
decimal CustomerCount = 0; decimal CustomerCount = 0;
if (item.CustomerCount > 0 && i > 0) if (firstModel.CustomerCount > 0 && i > 0)
{ {
CustomerCount = (item.CustomerCount - firstModel.CustomerCount) / item.CustomerCount * 100; CustomerCount = (item.CustomerCount - firstModel.CustomerCount) / firstModel.CustomerCount * 100;
} }
decimal B2CCount = 0; decimal B2CCount = 0;
if (item.B2CCount > 0 && i > 0) if (firstModel.B2CCount > 0 && i > 0)
{ {
B2CCount = (item.B2CCount - firstModel.B2CCount) / item.B2CCount * 100; B2CCount = (item.B2CCount - firstModel.B2CCount) / firstModel.B2CCount * 100;
} }
decimal TransCount = 0; decimal TransCount = 0;
if (item.TransCount > 0 && i > 0) if (item.TransCount > 0 && i > 0)
...@@ -1749,49 +1749,49 @@ namespace Edu.Module.User ...@@ -1749,49 +1749,49 @@ namespace Edu.Module.User
TransCount = (item.TransCount - firstModel.TransCount) / item.TransCount * 100; TransCount = (item.TransCount - firstModel.TransCount) / item.TransCount * 100;
} }
decimal InnerCount = 0; decimal InnerCount = 0;
if (item.InnerCount > 0 && i > 0) if (firstModel.InnerCount > 0 && i > 0)
{ {
InnerCount = (item.InnerCount - firstModel.InnerCount) / item.InnerCount * 100; InnerCount = (item.InnerCount - firstModel.InnerCount) / firstModel.InnerCount * 100;
} }
decimal InvalidCount = 0; decimal InvalidCount = 0;
if (item.InvalidCount > 0 && i > 0) if (firstModel.InvalidCount > 0 && i > 0)
{ {
InvalidCount = (item.InvalidCount - firstModel.InvalidCount) / item.InvalidCount * 100; InvalidCount = (item.InvalidCount - firstModel.InvalidCount) / firstModel.InvalidCount * 100;
} }
decimal SuspectedCount = 0; decimal SuspectedCount = 0;
if (item.SuspectedCount > 0 && i > 0) if (firstModel.SuspectedCount > 0 && i > 0)
{ {
SuspectedCount = (item.SuspectedCount - firstModel.SuspectedCount) / item.SuspectedCount * 100; SuspectedCount = (item.SuspectedCount - firstModel.SuspectedCount) / firstModel.SuspectedCount * 100;
} }
decimal IntentionCount = 0; decimal IntentionCount = 0;
if (item.IntentionCount > 0 && i > 0) if (firstModel.IntentionCount > 0 && i > 0)
{ {
IntentionCount = (item.IntentionCount - firstModel.IntentionCount) / item.IntentionCount * 100; IntentionCount = (item.IntentionCount - firstModel.IntentionCount) / firstModel.IntentionCount * 100;
} }
decimal InvitationCount = 0; decimal InvitationCount = 0;
if (item.InvitationCount > 0 && i > 0) if (firstModel.InvitationCount > 0 && i > 0)
{ {
InvitationCount = (item.InvitationCount - firstModel.InvitationCount) / item.InvitationCount * 100; InvitationCount = (item.InvitationCount - firstModel.InvitationCount) / firstModel.InvitationCount * 100;
} }
decimal NegotiationCount = 0; decimal NegotiationCount = 0;
if (item.NegotiationCount > 0 && i > 0) if (firstModel.NegotiationCount > 0 && i > 0)
{ {
NegotiationCount = (item.NegotiationCount - firstModel.NegotiationCount) / item.NegotiationCount * 100; NegotiationCount = (item.NegotiationCount - firstModel.NegotiationCount) / firstModel.NegotiationCount * 100;
} }
decimal ContractCount = 0; decimal ContractCount = 0;
if (item.ContractCount > 0 && i > 0) if (firstModel.ContractCount > 0 && i > 0)
{ {
ContractCount = (item.ContractCount - firstModel.ContractCount) / item.ContractCount * 100; ContractCount = (item.ContractCount - firstModel.ContractCount) / firstModel.ContractCount * 100;
} }
decimal OrderMoney = 0; decimal OrderMoney = 0;
if (item.OrderMoney > 0 && i > 0) if (firstModel.OrderMoney > 0 && i > 0)
{ {
OrderMoney = (item.OrderMoney - firstModel.OrderMoney) / item.OrderMoney * 100; OrderMoney = (item.OrderMoney - firstModel.OrderMoney) / firstModel.OrderMoney * 100;
} }
decimal StudyOrderMoney = 0; decimal StudyOrderMoney = 0;
if (item.StudyOrderMoney > 0 && i > 0) if (firstModel.StudyOrderMoney > 0 && i > 0)
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / item.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
rateList.Add(new RB_Student_Static_Extend() rateList.Add(new RB_Student_Static_Extend()
{ {
...@@ -2360,6 +2360,14 @@ namespace Edu.Module.User ...@@ -2360,6 +2360,14 @@ namespace Edu.Module.User
}); });
} }
var lastModel = rateList.FirstOrDefault(qitem => qitem.YearStr == minYear);
var curModel = rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear);
decimal CPushCount = 0;
if (lastModel.PushCount > 0)
{
CPushCount = (curModel.PushCount - lastModel.PushCount) / lastModel.PushCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "推送人数成长率", ItemName = "推送人数成长率",
...@@ -2367,9 +2375,14 @@ namespace Edu.Module.User ...@@ -2367,9 +2375,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).PushCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).PushCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).PushCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).PushCount, 2),
YearRate = Math.Round(rateList.Average(qitem =>qitem.PushCount), 2), YearRate = Math.Round(CPushCount, 2),
}); });
decimal CNewCount = 0;
if (lastModel.NewCount > 0)
{
CNewCount = (curModel.NewCount - lastModel.NewCount) / lastModel.NewCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "新客户成长率", ItemName = "新客户成长率",
...@@ -2377,9 +2390,14 @@ namespace Edu.Module.User ...@@ -2377,9 +2390,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).NewCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).NewCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NewCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NewCount, 2),
YearRate = Math.Round(rateList.Average(qitem=>qitem.NewCount), 2), YearRate = Math.Round(CNewCount, 2),
}); });
decimal CCommunicationCount = 0;
if (lastModel.CommunicationCount > 0)
{
CCommunicationCount = (curModel.CommunicationCount - lastModel.CommunicationCount) / lastModel.CommunicationCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "初步(二次)沟通成长率", ItemName = "初步(二次)沟通成长率",
...@@ -2387,9 +2405,14 @@ namespace Edu.Module.User ...@@ -2387,9 +2405,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).CommunicationCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).CommunicationCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2),
YearRate = Math.Round(rateList.Average(qitem => qitem.CommunicationCount), 2), YearRate = Math.Round(CCommunicationCount, 2),
}); });
decimal CTrialLessonCount = 0;
if (lastModel.TrialLessonCount > 0)
{
CTrialLessonCount = (curModel.TrialLessonCount - lastModel.TrialLessonCount) / lastModel.TrialLessonCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "预约试听(已到店.已试听)成长率", ItemName = "预约试听(已到店.已试听)成长率",
...@@ -2397,9 +2420,14 @@ namespace Edu.Module.User ...@@ -2397,9 +2420,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).TrialLessonCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).TrialLessonCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).TrialLessonCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).TrialLessonCount, 2),
YearRate = Math.Round(rateList.Average(qitem => qitem.TrialLessonCount), 2), YearRate = Math.Round(CTrialLessonCount, 2),
}); });
decimal CNotContacted = 0;
if (lastModel.NotContacted > 0)
{
CNotContacted = (curModel.NotContacted - lastModel.NotContacted) / lastModel.NotContacted * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "待联系成长率", ItemName = "待联系成长率",
...@@ -2407,9 +2435,14 @@ namespace Edu.Module.User ...@@ -2407,9 +2435,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).NotContacted, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).NotContacted, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2), YearRate = Math.Round(CNotContacted, 2),
}); });
decimal CJPCount = 0;
if (lastModel.JPCount > 0)
{
CJPCount = (curModel.JPCount - lastModel.JPCount) / lastModel.JPCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "日本语培成长率", ItemName = "日本语培成长率",
...@@ -2417,9 +2450,15 @@ namespace Edu.Module.User ...@@ -2417,9 +2450,15 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).JPCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).JPCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPCount, 2), YearRate = Math.Round(CJPCount, 2),
}); });
decimal CKRCount = 0;
if (lastModel.KRCount > 0)
{
CKRCount = (curModel.KRCount - lastModel.KRCount) / lastModel.KRCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "韩国语培成长率", ItemName = "韩国语培成长率",
...@@ -2427,9 +2466,14 @@ namespace Edu.Module.User ...@@ -2427,9 +2466,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).KRCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).KRCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRCount, 2), YearRate = Math.Round(CKRCount, 2),
}); });
decimal CFRCount = 0;
if (lastModel.FRCount > 0)
{
CFRCount = (curModel.FRCount - lastModel.FRCount) / lastModel.FRCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "法国语培成长率", ItemName = "法国语培成长率",
...@@ -2437,9 +2481,14 @@ namespace Edu.Module.User ...@@ -2437,9 +2481,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).FRCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).FRCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).FRCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).FRCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).FRCount, 2), YearRate = Math.Round(CFRCount, 2),
}); });
decimal CJPStudyCount = 0;
if (lastModel.JPStudyCount > 0)
{
CJPStudyCount = (curModel.JPStudyCount - lastModel.JPStudyCount) / lastModel.JPStudyCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "日本留学成长率", ItemName = "日本留学成长率",
...@@ -2447,9 +2496,14 @@ namespace Edu.Module.User ...@@ -2447,9 +2496,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).JPStudyCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).JPStudyCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPStudyCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPStudyCount, 2), YearRate = Math.Round(CJPStudyCount, 2),
}); });
decimal CKRStudyCount = 0;
if (lastModel.KRStudyCount > 0)
{
CKRStudyCount = (curModel.KRStudyCount - lastModel.KRStudyCount) / lastModel.KRStudyCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "韩国留学", ItemName = "韩国留学",
...@@ -2457,9 +2511,15 @@ namespace Edu.Module.User ...@@ -2457,9 +2511,15 @@ namespace Edu.Module.User
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).KRStudyCount, 2), FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).KRStudyCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRStudyCount, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRStudyCount, 2), YearRate = Math.Round(CKRStudyCount, 2),
}); });
decimal CYGAStudyCount = 0;
if (lastModel.YGAStudyCount > 0)
{
CYGAStudyCount = (curModel.YGAStudyCount - lastModel.YGAStudyCount) / lastModel.YGAStudyCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "英港澳留学成长率", ItemName = "英港澳留学成长率",
...@@ -2467,9 +2527,14 @@ namespace Edu.Module.User ...@@ -2467,9 +2527,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).YGAStudyCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).YGAStudyCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).YGAStudyCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).YGAStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).YGAStudyCount, 2), YearRate = Math.Round(CYGAStudyCount, 2),
}); });
decimal CUSStudyCount = 0;
if (lastModel.USStudyCount > 0)
{
CUSStudyCount = (curModel.USStudyCount - lastModel.USStudyCount) / lastModel.USStudyCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "美国留学成长率", ItemName = "美国留学成长率",
...@@ -2477,29 +2542,44 @@ namespace Edu.Module.User ...@@ -2477,29 +2542,44 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).USStudyCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).USStudyCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).USStudyCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).USStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).USStudyCount, 2), YearRate = Math.Round(CUSStudyCount, 2),
}); });
decimal CSGStudyCount = 0;
if (lastModel.SGStudyCount > 0)
{
CSGStudyCount = (curModel.SGStudyCount - lastModel.SGStudyCount) / lastModel.SGStudyCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "新加坡留学", ItemName = "新加坡留学成长率",
FirstYearStr = minYear, FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).SGStudyCount, 2), FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).SGStudyCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).SGStudyCount, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).SGStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).SGStudyCount, 2), YearRate = Math.Round(CSGStudyCount, 2),
}); });
decimal CAXStudyCount = 0;
if (lastModel.AXStudyCount > 0)
{
CAXStudyCount = (curModel.AXStudyCount - lastModel.AXStudyCount) / lastModel.AXStudyCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "澳新留学", ItemName = "澳新留学成长率",
FirstYearStr = minYear, FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).AXStudyCount, 2), FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).AXStudyCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).AXStudyCount, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).AXStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).AXStudyCount, 2), YearRate = Math.Round(CAXStudyCount, 2),
}); });
decimal COtherCount = 0;
if (lastModel.OtherCount > 0)
{
COtherCount = (curModel.OtherCount - lastModel.OtherCount) / lastModel.OtherCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "其他成长率", ItemName = "其他成长率",
...@@ -2507,9 +2587,14 @@ namespace Edu.Module.User ...@@ -2507,9 +2587,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).OtherCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).OtherCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OtherCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OtherCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OtherCount, 2), YearRate = Math.Round(COtherCount, 2),
}); });
decimal CClassACount = 0;
if (lastModel.ClassACount > 0)
{
CClassACount = (curModel.ClassACount - lastModel.ClassACount) / lastModel.ClassACount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "A类客户成长率", ItemName = "A类客户成长率",
...@@ -2517,9 +2602,14 @@ namespace Edu.Module.User ...@@ -2517,9 +2602,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassACount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassACount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassACount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassACount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassACount, 2), YearRate = Math.Round(CClassACount, 2),
}); });
decimal CClassBCount = 0;
if (lastModel.ClassBCount > 0)
{
CClassBCount = (curModel.ClassBCount - lastModel.ClassBCount) / lastModel.ClassBCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "B类客户成长率", ItemName = "B类客户成长率",
...@@ -2527,9 +2617,14 @@ namespace Edu.Module.User ...@@ -2527,9 +2617,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassBCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassBCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassBCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassBCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassBCount, 2), YearRate = Math.Round(CClassBCount, 2),
}); });
decimal CClassCCount = 0;
if (lastModel.ClassCCount > 0)
{
CClassCCount = (curModel.ClassCCount - lastModel.ClassCCount) / lastModel.ClassCCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "C类客户成长率", ItemName = "C类客户成长率",
...@@ -2537,9 +2632,14 @@ namespace Edu.Module.User ...@@ -2537,9 +2632,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassCCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassCCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassCCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassCCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassCCount, 2), YearRate = Math.Round(CClassCCount, 2),
}); });
decimal CClassDCount = 0;
if (lastModel.ClassDCount > 0)
{
CClassDCount = (curModel.ClassDCount - lastModel.ClassDCount) / lastModel.ClassDCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "D类客户成长率", ItemName = "D类客户成长率",
...@@ -2547,9 +2647,14 @@ namespace Edu.Module.User ...@@ -2547,9 +2647,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassDCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassDCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassDCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassDCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassDCount, 2), YearRate = Math.Round(CClassDCount, 2),
}); });
decimal CCustomerCount = 0;
if (lastModel.CustomerCount > 0)
{
CCustomerCount = (curModel.CustomerCount - lastModel.CustomerCount) / lastModel.CustomerCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "同行介绍成长率", ItemName = "同行介绍成长率",
...@@ -2557,9 +2662,14 @@ namespace Edu.Module.User ...@@ -2557,9 +2662,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).CustomerCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).CustomerCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CustomerCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CustomerCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CustomerCount, 2), YearRate = Math.Round(CCustomerCount, 2),
}); });
decimal CB2CCount = 0;
if (lastModel.B2CCount > 0)
{
CB2CCount = (curModel.B2CCount - lastModel.B2CCount) / lastModel.B2CCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "直客成长率", ItemName = "直客成长率",
...@@ -2567,9 +2677,14 @@ namespace Edu.Module.User ...@@ -2567,9 +2677,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).B2CCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).B2CCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).B2CCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).B2CCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).B2CCount, 2), YearRate = Math.Round(CB2CCount, 2),
}); });
decimal CTransCount = 0;
if (lastModel.TransCount > 0)
{
CTransCount = (curModel.TransCount - lastModel.TransCount) / lastModel.TransCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "学员转介绍成长率", ItemName = "学员转介绍成长率",
...@@ -2577,9 +2692,14 @@ namespace Edu.Module.User ...@@ -2577,9 +2692,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).TransCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).TransCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).TransCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).TransCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).TransCount, 2), YearRate = Math.Round(CTransCount, 2),
}); });
decimal CInnerCount = 0;
if (lastModel.InnerCount > 0)
{
CInnerCount = (curModel.InnerCount - lastModel.InnerCount) / lastModel.InnerCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "内部介绍成长率", ItemName = "内部介绍成长率",
...@@ -2587,9 +2707,14 @@ namespace Edu.Module.User ...@@ -2587,9 +2707,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).InnerCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).InnerCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InnerCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InnerCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InnerCount, 2), YearRate = Math.Round(CInnerCount, 2),
}); });
decimal CInvalidCount = 0;
if (lastModel.InvalidCount > 0)
{
CInvalidCount = (curModel.InvalidCount - lastModel.InvalidCount) / lastModel.InvalidCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "无效成长率", ItemName = "无效成长率",
...@@ -2597,9 +2722,14 @@ namespace Edu.Module.User ...@@ -2597,9 +2722,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).InvalidCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).InvalidCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvalidCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvalidCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvalidCount, 2), YearRate = Math.Round(CInvalidCount, 2),
}); });
decimal CSuspectedCount = 0;
if (lastModel.SuspectedCount > 0)
{
CSuspectedCount = (curModel.SuspectedCount - lastModel.SuspectedCount) / lastModel.SuspectedCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "疑似成长率", ItemName = "疑似成长率",
...@@ -2607,9 +2737,14 @@ namespace Edu.Module.User ...@@ -2607,9 +2737,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).SuspectedCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).SuspectedCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).SuspectedCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).SuspectedCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).SuspectedCount, 2), YearRate = Math.Round(CSuspectedCount, 2),
}); });
decimal CIntentionCount = 0;
if (lastModel.IntentionCount > 0)
{
CIntentionCount = (curModel.IntentionCount - lastModel.IntentionCount) / lastModel.IntentionCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "意向成长率", ItemName = "意向成长率",
...@@ -2617,9 +2752,14 @@ namespace Edu.Module.User ...@@ -2617,9 +2752,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).IntentionCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).IntentionCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).IntentionCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).IntentionCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).IntentionCount, 2), YearRate = Math.Round(CIntentionCount, 2),
}); });
decimal CInvitationCount = 0;
if (lastModel.InvitationCount > 0)
{
CInvitationCount = (curModel.InvitationCount - lastModel.InvitationCount) / lastModel.InvitationCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "近期课邀约成长率", ItemName = "近期课邀约成长率",
...@@ -2627,9 +2767,14 @@ namespace Edu.Module.User ...@@ -2627,9 +2767,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).InvitationCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).InvitationCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvitationCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvitationCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvitationCount, 2), YearRate = Math.Round(CInvitationCount, 2),
}); });
decimal CNegotiationCount = 0;
if (lastModel.NegotiationCount > 0)
{
CNegotiationCount = (curModel.NegotiationCount - lastModel.NegotiationCount) / lastModel.NegotiationCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "谈判成长率", ItemName = "谈判成长率",
...@@ -2637,9 +2782,14 @@ namespace Edu.Module.User ...@@ -2637,9 +2782,14 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).NegotiationCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).NegotiationCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NegotiationCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NegotiationCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NegotiationCount, 2), YearRate = Math.Round(CNegotiationCount, 2),
}); });
decimal CContractCount = 0;
if (lastModel.ContractCount > 0)
{
CContractCount = (curModel.ContractCount - lastModel.ContractCount) / lastModel.ContractCount * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "签约.成交.续费成长率", ItemName = "签约.成交.续费成长率",
...@@ -2647,9 +2797,13 @@ namespace Edu.Module.User ...@@ -2647,9 +2797,13 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ContractCount, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).ContractCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ContractCount, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ContractCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ContractCount, 2), YearRate = Math.Round(CContractCount, 2),
}); });
decimal COrderMoney = 0;
if (lastModel.OrderMoney > 0)
{
COrderMoney = (curModel.OrderMoney - lastModel.OrderMoney) / lastModel.OrderMoney * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "语培签约金额成长率", ItemName = "语培签约金额成长率",
...@@ -2657,9 +2811,13 @@ namespace Edu.Module.User ...@@ -2657,9 +2811,13 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).OrderMoney, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).OrderMoney, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2), YearRate = Math.Round(COrderMoney, 2),
}); });
decimal CStudyOrderMoney = 0;
if (lastModel.StudyOrderMoney > 0)
{
CStudyOrderMoney = (curModel.StudyOrderMoney - lastModel.StudyOrderMoney) / lastModel.StudyOrderMoney * 100;
}
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "留学签约金额成长率", ItemName = "留学签约金额成长率",
...@@ -2667,7 +2825,7 @@ namespace Edu.Module.User ...@@ -2667,7 +2825,7 @@ namespace Edu.Module.User
FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).StudyOrderMoney, 2), FirstYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == minYear).StudyOrderMoney, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), SecondYear = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), YearRate = Math.Round(CStudyOrderMoney, 2),
}); });
} }
...@@ -2684,6 +2842,15 @@ namespace Edu.Module.User ...@@ -2684,6 +2842,15 @@ namespace Edu.Module.User
public bool CreateStudentStaticModule(UserInfo user, string StartTime, string EndTime) public bool CreateStudentStaticModule(UserInfo user, string StartTime, string EndTime)
{ {
bool flag = true; bool flag = true;
//var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
//{
// //市场部编号4，课程顾问部编号13
// QDeptIds = "13",
// Group_Id = 100000,
// IsLeave = 1,
// UserRole = UserRoleEnum.CourseConsultant,
//});
string empIds = "";
student_StaticRepository.DeleteStudentStaticByProcRepository(); student_StaticRepository.DeleteStudentStaticByProcRepository();
var date = Convert.ToDateTime(StartTime); var date = Convert.ToDateTime(StartTime);
var endTime = Convert.ToDateTime(EndTime); var endTime = Convert.ToDateTime(EndTime);
...@@ -2691,7 +2858,7 @@ namespace Edu.Module.User ...@@ -2691,7 +2858,7 @@ namespace Edu.Module.User
for (int i = 0; i < Days; i++) for (int i = 0; i < Days; i++)
{ {
var newDate = date.AddDays(i); var newDate = date.AddDays(i);
var procModel = student_StaticRepository.GetStudentStaticByProcRepository(Common.ConvertHelper.FormatDate(newDate)); var procModel = student_StaticRepository.GetStudentStaticByProcRepository(Common.ConvertHelper.FormatDate(newDate), empIds);
var newModel = new RB_Student_Static() var newModel = new RB_Student_Static()
{ {
Id = 0, Id = 0,
......
Edu.Repository/User/RB_Student_StaticRepository.cs
View file @ 88cd5864
...@@ -128,7 +128,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' ...@@ -128,7 +128,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
/// </summary> /// </summary>
/// <param name="DateStr"></param> /// <param name="DateStr"></param>
/// <returns></returns> /// <returns></returns>
public RB_Student_Static_Extend GetStudentStaticByProcRepository(string DateStr) public RB_Student_Static_Extend GetStudentStaticByProcRepository(string DateStr,string empIds)
{ {
string sql = string.Format("call proc_student_static('{0}') ", DateStr); string sql = string.Format("call proc_student_static('{0}') ", DateStr);
var list = Get<RB_Student_Static_Extend>(sql); var list = Get<RB_Student_Static_Extend>(sql);
......
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