Skip to content

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

页面修改

parent f1970a59
Hide whitespace changes
Inline Side-by-side
Showing with 529 additions and 7 deletions
Edu.Model/Entity/User/RB_Student_Company.cs
View file @ 08bf409f
...@@ -211,5 +211,15 @@ namespace Edu.Model.Entity.User ...@@ -211,5 +211,15 @@ namespace Edu.Model.Entity.User
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary>
/// 语培订单待收金额
/// </summary>
public decimal OrderNotMoney { get; set; }
/// <summary>
/// 留学订单待收金额
/// </summary>
public decimal StudyOrderNotMoney { get; set; }
} }
} }
Edu.Model/Entity/User/RB_Student_Market.cs
View file @ 08bf409f
...@@ -181,5 +181,15 @@ namespace Edu.Model.Entity.User ...@@ -181,5 +181,15 @@ namespace Edu.Model.Entity.User
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary>
/// 语培订单待收金额
/// </summary>
public decimal OrderNotMoney { get; set; }
/// <summary>
/// 留学订单待收金额
/// </summary>
public decimal StudyOrderNotMoney { get; set; }
} }
} }
Edu.Model/Entity/User/RB_Student_Static.cs
View file @ 08bf409f
...@@ -211,5 +211,15 @@ namespace Edu.Model.Entity.User ...@@ -211,5 +211,15 @@ namespace Edu.Model.Entity.User
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary>
/// 语培订单待收金额
/// </summary>
public decimal OrderNotMoney { get; set; }
/// <summary>
/// 留学订单待收金额
/// </summary>
public decimal StudyOrderNotMoney { get; set; }
} }
} }
Edu.Module.User/StudentStatModule.cs
View file @ 08bf409f
...@@ -568,6 +568,16 @@ namespace Edu.Module.User ...@@ -568,6 +568,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
subObj = new subObj = new
{ {
Id = 0, Id = 0,
...@@ -603,6 +613,8 @@ namespace Edu.Module.User ...@@ -603,6 +613,8 @@ namespace Edu.Module.User
ContractCount = Math.Round(ContractCount, 2) + "%", ContractCount = Math.Round(ContractCount, 2) + "%",
OrderMoney = Math.Round(OrderMoney, 2) + "%", OrderMoney = Math.Round(OrderMoney, 2) + "%",
StudyOrderMoney = Math.Round(StudyOrderMoney, 2) + "%", StudyOrderMoney = Math.Round(StudyOrderMoney, 2) + "%",
OrderNotMoney = Math.Round(OrderNotMoney, 2) + "%",
StudyOrderNotMoney = Math.Round(StudyOrderNotMoney, 2) + "%",
}; };
} }
firstModel = item; firstModel = item;
...@@ -643,6 +655,8 @@ namespace Edu.Module.User ...@@ -643,6 +655,8 @@ namespace Edu.Module.User
item.ContractCount, item.ContractCount,
item.OrderMoney, item.OrderMoney,
item.StudyOrderMoney, item.StudyOrderMoney,
item.OrderNotMoney,
item.StudyOrderNotMoney,
}); });
if (DateStr.Contains("总数") && index > 1) if (DateStr.Contains("总数") && index > 1)
{ {
...@@ -685,6 +699,8 @@ namespace Edu.Module.User ...@@ -685,6 +699,8 @@ namespace Edu.Module.User
ContractCount = tempList?.Sum(qitem => qitem.ContractCount), ContractCount = tempList?.Sum(qitem => qitem.ContractCount),
OrderMoney = tempList?.Sum(qitem => qitem.OrderMoney), OrderMoney = tempList?.Sum(qitem => qitem.OrderMoney),
StudyOrderMoney = tempList?.Sum(qitem => qitem.StudyOrderMoney), StudyOrderMoney = tempList?.Sum(qitem => qitem.StudyOrderMoney),
OrderNotMoney = tempList?.Sum(qitem => qitem.OrderNotMoney),
StudyOrderNotMoney = tempList?.Sum(qitem => qitem.StudyOrderNotMoney),
}); });
} }
return dataList; return dataList;
...@@ -737,6 +753,8 @@ namespace Edu.Module.User ...@@ -737,6 +753,8 @@ namespace Edu.Module.User
ContractCount = tempData?.ContractCount ?? 0, ContractCount = tempData?.ContractCount ?? 0,
OrderMoney = tempData?.OrderMoney ?? 0, OrderMoney = tempData?.OrderMoney ?? 0,
StudyOrderMoney = tempData?.StudyOrderMoney ?? 0, StudyOrderMoney = tempData?.StudyOrderMoney ?? 0,
OrderNotMoney = tempData?.OrderNotMoney ?? 0,
StudyOrderNotMoney = tempData?.StudyOrderNotMoney ?? 0,
}; };
monthList.Add(newData); monthList.Add(newData);
} }
...@@ -774,6 +792,8 @@ namespace Edu.Module.User ...@@ -774,6 +792,8 @@ namespace Edu.Module.User
ContractCount = Math.Round(monthList?.Average(qitem => qitem.ContractCount) ?? 0, 2), ContractCount = Math.Round(monthList?.Average(qitem => qitem.ContractCount) ?? 0, 2),
OrderMoney = Math.Round(monthList?.Average(qitem => qitem.OrderMoney) ?? 0, 2), OrderMoney = Math.Round(monthList?.Average(qitem => qitem.OrderMoney) ?? 0, 2),
StudyOrderMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderMoney) ?? 0, 2), StudyOrderMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderMoney) ?? 0, 2),
OrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.OrderNotMoney) ?? 0, 2),
StudyOrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderNotMoney) ?? 0, 2),
}; };
var sumModel = new RB_Student_Static_Extend() var sumModel = new RB_Student_Static_Extend()
...@@ -810,6 +830,8 @@ namespace Edu.Module.User ...@@ -810,6 +830,8 @@ namespace Edu.Module.User
ContractCount = monthList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = monthList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = monthList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = monthList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = monthList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = monthList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = monthList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = monthList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
}; };
monthList.Add(avgModel); monthList.Add(avgModel);
monthList.Add(sumModel); monthList.Add(sumModel);
...@@ -850,6 +872,8 @@ namespace Edu.Module.User ...@@ -850,6 +872,8 @@ namespace Edu.Module.User
item.ContractCount, item.ContractCount,
item.OrderMoney, item.OrderMoney,
item.StudyOrderMoney, item.StudyOrderMoney,
item.OrderNotMoney,
item.StudyOrderNotMoney,
}); });
} }
return dataList; return dataList;
...@@ -1029,6 +1053,16 @@ namespace Edu.Module.User ...@@ -1029,6 +1053,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
var newModel = new RB_Student_Static_Extend() var newModel = new RB_Student_Static_Extend()
{ {
MonthStr = i + 1, MonthStr = i + 1,
...@@ -1063,6 +1097,8 @@ namespace Edu.Module.User ...@@ -1063,6 +1097,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney,
}; };
result.Add(newModel); result.Add(newModel);
} }
...@@ -1603,6 +1639,24 @@ namespace Edu.Module.User ...@@ -1603,6 +1639,24 @@ namespace Edu.Module.User
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).OrderMoney, 2), DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).OrderMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.OrderMoney), 2), AvgRate = Math.Round(result.Average(qitem => qitem.OrderMoney), 2),
}); });
monthList.Add(new RateMonthItem()
{
ItemName = "语培签约待收金额成长率",
JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).OrderNotMoney, 2),
FebruaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 2).OrderNotMoney, 2),
MarchRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 3).OrderNotMoney, 2),
AprilRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 4).OrderNotMoney, 2),
MayRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 5).OrderNotMoney, 2),
JuneRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 6).OrderNotMoney, 2),
JulyRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 7).OrderNotMoney, 2),
AugustRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 8).OrderNotMoney, 2),
SeptemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 9).OrderNotMoney, 2),
OctoberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 10).OrderNotMoney, 2),
NovemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 11).OrderNotMoney, 2),
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).OrderNotMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.OrderNotMoney), 2),
});
monthList.Add(new RateMonthItem() monthList.Add(new RateMonthItem()
{ {
ItemName = "留学签约金额成长率", ItemName = "留学签约金额成长率",
...@@ -1620,6 +1674,23 @@ namespace Edu.Module.User ...@@ -1620,6 +1674,23 @@ namespace Edu.Module.User
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderMoney, 2), DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderMoney), 2), AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderMoney), 2),
}); });
monthList.Add(new RateMonthItem()
{
ItemName = "留学签约待收金额成长率",
JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).StudyOrderNotMoney, 2),
FebruaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 2).StudyOrderNotMoney, 2),
MarchRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 3).StudyOrderNotMoney, 2),
AprilRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 4).StudyOrderNotMoney, 2),
MayRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 5).StudyOrderNotMoney, 2),
JuneRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 6).StudyOrderNotMoney, 2),
JulyRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 7).StudyOrderNotMoney, 2),
AugustRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 8).StudyOrderNotMoney, 2),
SeptemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 9).StudyOrderNotMoney, 2),
OctoberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 10).StudyOrderNotMoney, 2),
NovemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 11).StudyOrderNotMoney, 2),
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderNotMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderNotMoney), 2),
});
return monthList; return monthList;
} }
...@@ -1802,6 +1873,16 @@ namespace Edu.Module.User ...@@ -1802,6 +1873,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
rateList.Add(new RB_Student_Static_Extend() rateList.Add(new RB_Student_Static_Extend()
{ {
YearStr = minYear + i, YearStr = minYear + i,
...@@ -1836,6 +1917,8 @@ namespace Edu.Module.User ...@@ -1836,6 +1917,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney,
}); });
} }
...@@ -2138,7 +2221,15 @@ namespace Edu.Module.User ...@@ -2138,7 +2221,15 @@ namespace Edu.Module.User
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
}); });
yearList.Add(new RateYearItem()
{
ItemName = "语培签约待收金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).OrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderNotMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderNotMoney, 2),
});
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "留学签约金额", ItemName = "留学签约金额",
...@@ -2148,6 +2239,15 @@ namespace Edu.Module.User ...@@ -2148,6 +2239,15 @@ namespace Edu.Module.User
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
}); });
yearList.Add(new RateYearItem()
{
ItemName = "留学签约待收金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).StudyOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderNotMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderNotMoney, 2),
});
} }
return yearList; return yearList;
} }
...@@ -2334,6 +2434,16 @@ namespace Edu.Module.User ...@@ -2334,6 +2434,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
var newModel = new RB_Student_Static_Extend() var newModel = new RB_Student_Static_Extend()
{ {
YearStr = minYear + y, YearStr = minYear + y,
...@@ -2369,6 +2479,8 @@ namespace Edu.Module.User ...@@ -2369,6 +2479,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney
}; };
result.Add(newModel); result.Add(newModel);
} }
...@@ -2885,6 +2997,23 @@ namespace Edu.Module.User ...@@ -2885,6 +2997,23 @@ namespace Edu.Module.User
YearRate = Math.Round(COrderMoney, 2), YearRate = Math.Round(COrderMoney, 2),
}); });
var lastOrderNotMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.OrderNotMoney);
var curOrderNotMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.OrderNotMoney);
decimal COrderNotMoney = 0;
if (lastOrderNotMoney > 0)
{
COrderNotMoney = (curOrderNotMoney - lastOrderNotMoney) / lastOrderNotMoney * 100;
}
yearList.Add(new RateYearItem()
{
ItemName = "语培签约待收金额成长率",
FirstYearStr = minYear,
FirstYear = Math.Round(lastOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(curOrderNotMoney, 2),
YearRate = Math.Round(COrderNotMoney, 2),
});
var lastStudyOrderMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderMoney); var lastStudyOrderMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderMoney);
var curStudyOrderMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderMoney); var curStudyOrderMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderMoney);
decimal CStudyOrderMoney = 0; decimal CStudyOrderMoney = 0;
...@@ -2901,6 +3030,23 @@ namespace Edu.Module.User ...@@ -2901,6 +3030,23 @@ namespace Edu.Module.User
SecondYear = Math.Round(curStudyOrderMoney, 2), SecondYear = Math.Round(curStudyOrderMoney, 2),
YearRate = Math.Round(CStudyOrderMoney, 2), YearRate = Math.Round(CStudyOrderMoney, 2),
}); });
var lastStudyOrderNotMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderNotMoney);
var curStudyOrderNotMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderNotMoney);
decimal CStudyOrderNotMoney = 0;
if (lastStudyOrderNotMoney > 0)
{
CStudyOrderNotMoney = (curStudyOrderNotMoney - lastStudyOrderNotMoney) / lastStudyOrderNotMoney * 100;
}
yearList.Add(new RateYearItem()
{
ItemName = "留学签约待收金额成长率",
FirstYearStr = minYear,
FirstYear = Math.Round(lastStudyOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(curStudyOrderNotMoney, 2),
YearRate = Math.Round(CStudyOrderNotMoney, 2),
});
} }
return yearList; return yearList;
} }
...@@ -2964,6 +3110,8 @@ namespace Edu.Module.User ...@@ -2964,6 +3110,8 @@ namespace Edu.Module.User
StudyOrderMoney = procModel?.StudyOrderMoney ?? 0, StudyOrderMoney = procModel?.StudyOrderMoney ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
OrderNotMoney = procModel?.OrderNotMoney ?? 0,
StudyOrderNotMoney = procModel?.StudyOrderNotMoney ?? 0,
}; };
int times = 1; int times = 1;
int newDay = newDate.Day; int newDay = newDate.Day;
...@@ -3016,6 +3164,8 @@ namespace Edu.Module.User ...@@ -3016,6 +3164,8 @@ namespace Edu.Module.User
ContractCount = lastMonthLastTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = lastMonthLastTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3073,6 +3223,8 @@ namespace Edu.Module.User ...@@ -3073,6 +3223,8 @@ namespace Edu.Module.User
ContractCount = curMonthFirstTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthFirstTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3130,6 +3282,8 @@ namespace Edu.Module.User ...@@ -3130,6 +3282,8 @@ namespace Edu.Module.User
ContractCount = curMonthSecondTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthSecondTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3195,6 +3349,8 @@ namespace Edu.Module.User ...@@ -3195,6 +3349,8 @@ namespace Edu.Module.User
ContractCount = curMonthThirdTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthThirdTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3262,6 +3418,8 @@ namespace Edu.Module.User ...@@ -3262,6 +3418,8 @@ namespace Edu.Module.User
ContractCount = procModel?.ContractCount ?? 0, ContractCount = procModel?.ContractCount ?? 0,
OrderMoney = procModel?.OrderMoney ?? 0, OrderMoney = procModel?.OrderMoney ?? 0,
StudyOrderMoney = procModel?.StudyOrderMoney ?? 0, StudyOrderMoney = procModel?.StudyOrderMoney ?? 0,
OrderNotMoney = procModel?.OrderNotMoney ?? 0,
StudyOrderNotMoney = procModel?.StudyOrderNotMoney ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3310,6 +3468,8 @@ namespace Edu.Module.User ...@@ -3310,6 +3468,8 @@ namespace Edu.Module.User
ContractCount = lastMonthLastTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = lastMonthLastTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3361,6 +3521,8 @@ namespace Edu.Module.User ...@@ -3361,6 +3521,8 @@ namespace Edu.Module.User
ContractCount = curMonthFirstTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthFirstTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3412,6 +3574,8 @@ namespace Edu.Module.User ...@@ -3412,6 +3574,8 @@ namespace Edu.Module.User
ContractCount = curMonthSecondTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthSecondTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3471,6 +3635,8 @@ namespace Edu.Module.User ...@@ -3471,6 +3635,8 @@ namespace Edu.Module.User
ContractCount = curMonthThirdTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthThirdTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -3645,6 +3811,16 @@ namespace Edu.Module.User ...@@ -3645,6 +3811,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
subObj = new subObj = new
{ {
Id = 0, Id = 0,
...@@ -3674,6 +3850,8 @@ namespace Edu.Module.User ...@@ -3674,6 +3850,8 @@ namespace Edu.Module.User
ContractCount = Math.Round(ContractCount, 2) + "%", ContractCount = Math.Round(ContractCount, 2) + "%",
OrderMoney = Math.Round(OrderMoney, 2) + "%", OrderMoney = Math.Round(OrderMoney, 2) + "%",
StudyOrderMoney = Math.Round(StudyOrderMoney, 2) + "%", StudyOrderMoney = Math.Round(StudyOrderMoney, 2) + "%",
OrderNotMoney = Math.Round(OrderNotMoney, 2) + "%",
StudyOrderNotMoney = Math.Round(StudyOrderNotMoney, 2) + "%",
}; };
} }
firstModel = item; firstModel = item;
...@@ -3708,6 +3886,8 @@ namespace Edu.Module.User ...@@ -3708,6 +3886,8 @@ namespace Edu.Module.User
item.ContractCount, item.ContractCount,
item.OrderMoney, item.OrderMoney,
item.StudyOrderMoney, item.StudyOrderMoney,
item.OrderNotMoney,
item.StudyOrderNotMoney,
}); });
if (DateStr.Contains("总数") && index > 1) if (DateStr.Contains("总数") && index > 1)
{ {
...@@ -3744,6 +3924,8 @@ namespace Edu.Module.User ...@@ -3744,6 +3924,8 @@ namespace Edu.Module.User
ContractCount = tempList?.Sum(qitem => qitem.ContractCount), ContractCount = tempList?.Sum(qitem => qitem.ContractCount),
OrderMoney = tempList?.Sum(qitem => qitem.OrderMoney), OrderMoney = tempList?.Sum(qitem => qitem.OrderMoney),
StudyOrderMoney = tempList?.Sum(qitem => qitem.StudyOrderMoney), StudyOrderMoney = tempList?.Sum(qitem => qitem.StudyOrderMoney),
OrderNotMoney = tempList?.Sum(qitem => qitem.OrderNotMoney),
StudyOrderNotMoney = tempList?.Sum(qitem => qitem.StudyOrderNotMoney),
}); });
} }
return dataList; return dataList;
...@@ -3790,6 +3972,8 @@ namespace Edu.Module.User ...@@ -3790,6 +3972,8 @@ namespace Edu.Module.User
ContractCount = tempData?.ContractCount ?? 0, ContractCount = tempData?.ContractCount ?? 0,
OrderMoney = tempData?.OrderMoney ?? 0, OrderMoney = tempData?.OrderMoney ?? 0,
StudyOrderMoney = tempData?.StudyOrderMoney ?? 0, StudyOrderMoney = tempData?.StudyOrderMoney ?? 0,
OrderNotMoney = tempData?.OrderNotMoney ?? 0,
StudyOrderNotMoney = tempData?.StudyOrderNotMoney ?? 0,
}; };
monthList.Add(newData); monthList.Add(newData);
} }
...@@ -3821,6 +4005,8 @@ namespace Edu.Module.User ...@@ -3821,6 +4005,8 @@ namespace Edu.Module.User
ContractCount = Math.Round(monthList?.Average(qitem => qitem.ContractCount) ?? 0, 2), ContractCount = Math.Round(monthList?.Average(qitem => qitem.ContractCount) ?? 0, 2),
OrderMoney = Math.Round(monthList?.Average(qitem => qitem.OrderMoney) ?? 0, 2), OrderMoney = Math.Round(monthList?.Average(qitem => qitem.OrderMoney) ?? 0, 2),
StudyOrderMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderMoney) ?? 0, 2), StudyOrderMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderMoney) ?? 0, 2),
OrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.OrderNotMoney) ?? 0, 2),
StudyOrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderNotMoney) ?? 0, 2),
}; };
var sumModel = new RB_Student_Market_Extend() var sumModel = new RB_Student_Market_Extend()
...@@ -3851,6 +4037,8 @@ namespace Edu.Module.User ...@@ -3851,6 +4037,8 @@ namespace Edu.Module.User
ContractCount = monthList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = monthList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = monthList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = monthList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = monthList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = monthList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = monthList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = monthList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
}; };
monthList.Add(avgModel); monthList.Add(avgModel);
monthList.Add(sumModel); monthList.Add(sumModel);
...@@ -3885,6 +4073,8 @@ namespace Edu.Module.User ...@@ -3885,6 +4073,8 @@ namespace Edu.Module.User
item.ContractCount, item.ContractCount,
item.OrderMoney, item.OrderMoney,
item.StudyOrderMoney, item.StudyOrderMoney,
item.OrderNotMoney,
item.StudyOrderNotMoney,
}); });
} }
return dataList; return dataList;
...@@ -4036,6 +4226,16 @@ namespace Edu.Module.User ...@@ -4036,6 +4226,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
var newModel = new RB_Student_Market_Extend() var newModel = new RB_Student_Market_Extend()
{ {
MonthStr = i + 1, MonthStr = i + 1,
...@@ -4064,6 +4264,8 @@ namespace Edu.Module.User ...@@ -4064,6 +4264,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney,
}; };
result.Add(newModel); result.Add(newModel);
} }
...@@ -4493,6 +4695,23 @@ namespace Edu.Module.User ...@@ -4493,6 +4695,23 @@ namespace Edu.Module.User
AvgRate = Math.Round(result.Average(qitem => qitem.OrderMoney), 2), AvgRate = Math.Round(result.Average(qitem => qitem.OrderMoney), 2),
}); });
monthList.Add(new RateMonthItem()
{
ItemName = "语培签约待收金额成长率",
JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).OrderNotMoney, 2),
FebruaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 2).OrderNotMoney, 2),
MarchRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 3).OrderNotMoney, 2),
AprilRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 4).OrderNotMoney, 2),
MayRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 5).OrderNotMoney, 2),
JuneRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 6).OrderNotMoney, 2),
JulyRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 7).OrderNotMoney, 2),
AugustRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 8).OrderNotMoney, 2),
SeptemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 9).OrderNotMoney, 2),
OctoberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 10).OrderNotMoney, 2),
NovemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 11).OrderNotMoney, 2),
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).OrderNotMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.OrderNotMoney), 2),
});
monthList.Add(new RateMonthItem() monthList.Add(new RateMonthItem()
{ {
ItemName = "留学签约金额成长率", ItemName = "留学签约金额成长率",
...@@ -4510,6 +4729,23 @@ namespace Edu.Module.User ...@@ -4510,6 +4729,23 @@ namespace Edu.Module.User
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderMoney, 2), DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderMoney), 2), AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderMoney), 2),
}); });
monthList.Add(new RateMonthItem()
{
ItemName = "留学签约待收金额成长率",
JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).StudyOrderNotMoney, 2),
FebruaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 2).StudyOrderNotMoney, 2),
MarchRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 3).StudyOrderNotMoney, 2),
AprilRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 4).StudyOrderNotMoney, 2),
MayRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 5).StudyOrderNotMoney, 2),
JuneRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 6).StudyOrderNotMoney, 2),
JulyRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 7).StudyOrderNotMoney, 2),
AugustRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 8).StudyOrderNotMoney, 2),
SeptemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 9).StudyOrderNotMoney, 2),
OctoberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 10).StudyOrderNotMoney, 2),
NovemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 11).StudyOrderNotMoney, 2),
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderNotMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderNotMoney), 2),
});
return monthList; return monthList;
} }
...@@ -4662,6 +4898,16 @@ namespace Edu.Module.User ...@@ -4662,6 +4898,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
rateList.Add(new RB_Student_Market_Extend() rateList.Add(new RB_Student_Market_Extend()
{ {
YearStr = minYear + i, YearStr = minYear + i,
...@@ -4690,6 +4936,8 @@ namespace Edu.Module.User ...@@ -4690,6 +4936,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney,
}); });
} }
...@@ -4930,7 +5178,15 @@ namespace Edu.Module.User ...@@ -4930,7 +5178,15 @@ namespace Edu.Module.User
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
}); });
yearList.Add(new RateYearItem()
{
ItemName = "语培签约待收金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).OrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderNotMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderNotMoney, 2),
});
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "留学签约金额", ItemName = "留学签约金额",
...@@ -4940,6 +5196,15 @@ namespace Edu.Module.User ...@@ -4940,6 +5196,15 @@ namespace Edu.Module.User
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
}); });
yearList.Add(new RateYearItem()
{
ItemName = "留学签约待收金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).StudyOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderNotMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderNotMoney, 2),
});
} }
return yearList; return yearList;
} }
...@@ -5097,6 +5362,16 @@ namespace Edu.Module.User ...@@ -5097,6 +5362,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
var newModel = new RB_Student_Market_Extend() var newModel = new RB_Student_Market_Extend()
{ {
YearStr = minYear + y, YearStr = minYear + y,
...@@ -5126,6 +5401,8 @@ namespace Edu.Module.User ...@@ -5126,6 +5401,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney,
}; };
result.Add(newModel); result.Add(newModel);
} }
...@@ -5540,6 +5817,23 @@ namespace Edu.Module.User ...@@ -5540,6 +5817,23 @@ namespace Edu.Module.User
YearRate = Math.Round(COrderMoney, 2), YearRate = Math.Round(COrderMoney, 2),
}); });
var lastOrderNotMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.OrderNotMoney);
var curOrderNotMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.OrderNotMoney);
decimal COrderNotMoney = 0;
if (lastOrderNotMoney > 0)
{
COrderNotMoney = (curOrderNotMoney - lastOrderNotMoney) / lastOrderNotMoney * 100;
}
yearList.Add(new RateYearItem()
{
ItemName = "语培签约待收金额成长率",
FirstYearStr = minYear,
FirstYear = Math.Round(lastOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(curOrderNotMoney, 2),
YearRate = Math.Round(COrderNotMoney, 2),
});
var lastStudyOrderMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderMoney); var lastStudyOrderMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderMoney);
var curStudyOrderMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderMoney); var curStudyOrderMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderMoney);
decimal CStudyOrderMoney = 0; decimal CStudyOrderMoney = 0;
...@@ -5556,6 +5850,23 @@ namespace Edu.Module.User ...@@ -5556,6 +5850,23 @@ namespace Edu.Module.User
SecondYear = Math.Round(curStudyOrderMoney, 2), SecondYear = Math.Round(curStudyOrderMoney, 2),
YearRate = Math.Round(CStudyOrderMoney, 2), YearRate = Math.Round(CStudyOrderMoney, 2),
}); });
var lastStudyOrderNotMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderNotMoney);
var curStudyOrderNotMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderNotMoney);
decimal CStudyOrderNotMoney = 0;
if (lastStudyOrderNotMoney > 0)
{
CStudyOrderNotMoney = (curStudyOrderNotMoney - lastStudyOrderNotMoney) / lastStudyOrderNotMoney * 100;
}
yearList.Add(new RateYearItem()
{
ItemName = "留学签约待收金额成长率",
FirstYearStr = minYear,
FirstYear = Math.Round(lastStudyOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(curStudyOrderNotMoney, 2),
YearRate = Math.Round(CStudyOrderNotMoney, 2),
});
} }
return yearList; return yearList;
} }
...@@ -5748,6 +6059,16 @@ namespace Edu.Module.User ...@@ -5748,6 +6059,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
subObj = new subObj = new
{ {
Id = 0, Id = 0,
...@@ -5783,6 +6104,8 @@ namespace Edu.Module.User ...@@ -5783,6 +6104,8 @@ namespace Edu.Module.User
ContractCount = Math.Round(ContractCount, 2) + "%", ContractCount = Math.Round(ContractCount, 2) + "%",
OrderMoney = Math.Round(OrderMoney, 2) + "%", OrderMoney = Math.Round(OrderMoney, 2) + "%",
StudyOrderMoney = Math.Round(StudyOrderMoney, 2) + "%", StudyOrderMoney = Math.Round(StudyOrderMoney, 2) + "%",
OrderNotMoney = Math.Round(OrderNotMoney, 2) + "%",
StudyOrderNotMoney = Math.Round(StudyOrderNotMoney, 2) + "%",
}; };
} }
firstModel = item; firstModel = item;
...@@ -5823,6 +6146,8 @@ namespace Edu.Module.User ...@@ -5823,6 +6146,8 @@ namespace Edu.Module.User
item.ContractCount, item.ContractCount,
item.OrderMoney, item.OrderMoney,
item.StudyOrderMoney, item.StudyOrderMoney,
item.OrderNotMoney,
item.StudyOrderNotMoney,
}); });
if (DateStr.Contains("总数") && index > 1) if (DateStr.Contains("总数") && index > 1)
{ {
...@@ -5865,6 +6190,8 @@ namespace Edu.Module.User ...@@ -5865,6 +6190,8 @@ namespace Edu.Module.User
ContractCount = tempList?.Sum(qitem => qitem.ContractCount), ContractCount = tempList?.Sum(qitem => qitem.ContractCount),
OrderMoney = tempList?.Sum(qitem => qitem.OrderMoney), OrderMoney = tempList?.Sum(qitem => qitem.OrderMoney),
StudyOrderMoney = tempList?.Sum(qitem => qitem.StudyOrderMoney), StudyOrderMoney = tempList?.Sum(qitem => qitem.StudyOrderMoney),
OrderNotMoney = tempList?.Sum(qitem => qitem.OrderNotMoney),
StudyOrderNotMoney = tempList?.Sum(qitem => qitem.StudyOrderNotMoney),
}); });
} }
return dataList; return dataList;
...@@ -5917,6 +6244,8 @@ namespace Edu.Module.User ...@@ -5917,6 +6244,8 @@ namespace Edu.Module.User
ContractCount = tempData?.ContractCount ?? 0, ContractCount = tempData?.ContractCount ?? 0,
OrderMoney = tempData?.OrderMoney ?? 0, OrderMoney = tempData?.OrderMoney ?? 0,
StudyOrderMoney = tempData?.StudyOrderMoney ?? 0, StudyOrderMoney = tempData?.StudyOrderMoney ?? 0,
OrderNotMoney = tempData?.OrderNotMoney ?? 0,
StudyOrderNotMoney = tempData?.StudyOrderNotMoney ?? 0,
}; };
monthList.Add(newData); monthList.Add(newData);
} }
...@@ -5954,6 +6283,8 @@ namespace Edu.Module.User ...@@ -5954,6 +6283,8 @@ namespace Edu.Module.User
ContractCount = Math.Round(monthList?.Average(qitem => qitem.ContractCount) ?? 0, 2), ContractCount = Math.Round(monthList?.Average(qitem => qitem.ContractCount) ?? 0, 2),
OrderMoney = Math.Round(monthList?.Average(qitem => qitem.OrderMoney) ?? 0, 2), OrderMoney = Math.Round(monthList?.Average(qitem => qitem.OrderMoney) ?? 0, 2),
StudyOrderMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderMoney) ?? 0, 2), StudyOrderMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderMoney) ?? 0, 2),
OrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.OrderNotMoney) ?? 0, 2),
StudyOrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderNotMoney) ?? 0, 2),
}; };
var sumModel = new RB_Student_Company_Extend() var sumModel = new RB_Student_Company_Extend()
...@@ -5990,6 +6321,8 @@ namespace Edu.Module.User ...@@ -5990,6 +6321,8 @@ namespace Edu.Module.User
ContractCount = monthList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = monthList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = monthList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = monthList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = monthList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = monthList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = monthList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = monthList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
}; };
monthList.Add(avgModel); monthList.Add(avgModel);
monthList.Add(sumModel); monthList.Add(sumModel);
...@@ -6030,6 +6363,8 @@ namespace Edu.Module.User ...@@ -6030,6 +6363,8 @@ namespace Edu.Module.User
item.ContractCount, item.ContractCount,
item.OrderMoney, item.OrderMoney,
item.StudyOrderMoney, item.StudyOrderMoney,
item.OrderNotMoney,
item.StudyOrderNotMoney,
}); });
} }
return dataList; return dataList;
...@@ -6209,6 +6544,16 @@ namespace Edu.Module.User ...@@ -6209,6 +6544,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
var newModel = new RB_Student_Company_Extend() var newModel = new RB_Student_Company_Extend()
{ {
MonthStr = i + 1, MonthStr = i + 1,
...@@ -6243,10 +6588,11 @@ namespace Edu.Module.User ...@@ -6243,10 +6588,11 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney,
}; };
result.Add(newModel); result.Add(newModel);
} }
monthList.Add(new RateMonthItem() monthList.Add(new RateMonthItem()
{ {
ItemName = "推送人数成长率", ItemName = "推送人数成长率",
...@@ -6784,6 +7130,23 @@ namespace Edu.Module.User ...@@ -6784,6 +7130,23 @@ namespace Edu.Module.User
AvgRate = Math.Round(result.Average(qitem => qitem.OrderMoney), 2), AvgRate = Math.Round(result.Average(qitem => qitem.OrderMoney), 2),
}); });
monthList.Add(new RateMonthItem() monthList.Add(new RateMonthItem()
{
ItemName = "语培签约待收金额成长率",
JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).OrderNotMoney, 2),
FebruaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 2).OrderNotMoney, 2),
MarchRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 3).OrderNotMoney, 2),
AprilRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 4).OrderNotMoney, 2),
MayRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 5).OrderNotMoney, 2),
JuneRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 6).OrderNotMoney, 2),
JulyRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 7).OrderNotMoney, 2),
AugustRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 8).OrderNotMoney, 2),
SeptemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 9).OrderNotMoney, 2),
OctoberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 10).OrderNotMoney, 2),
NovemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 11).OrderNotMoney, 2),
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).OrderNotMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.OrderNotMoney), 2),
});
monthList.Add(new RateMonthItem()
{ {
ItemName = "留学签约金额成长率", ItemName = "留学签约金额成长率",
JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).StudyOrderMoney, 2), JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).StudyOrderMoney, 2),
...@@ -6800,6 +7163,23 @@ namespace Edu.Module.User ...@@ -6800,6 +7163,23 @@ namespace Edu.Module.User
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderMoney, 2), DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderMoney), 2), AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderMoney), 2),
}); });
monthList.Add(new RateMonthItem()
{
ItemName = "留学签约待收金额成长率",
JanuaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 1).StudyOrderNotMoney, 2),
FebruaryRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 2).StudyOrderNotMoney, 2),
MarchRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 3).StudyOrderNotMoney, 2),
AprilRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 4).StudyOrderNotMoney, 2),
MayRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 5).StudyOrderNotMoney, 2),
JuneRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 6).StudyOrderNotMoney, 2),
JulyRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 7).StudyOrderNotMoney, 2),
AugustRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 8).StudyOrderNotMoney, 2),
SeptemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 9).StudyOrderNotMoney, 2),
OctoberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 10).StudyOrderNotMoney, 2),
NovemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 11).StudyOrderNotMoney, 2),
DecemberRate = Math.Round(result.FirstOrDefault(qitem => qitem.MonthStr == 12).StudyOrderNotMoney, 2),
AvgRate = Math.Round(result.Average(qitem => qitem.StudyOrderNotMoney), 2),
});
return monthList; return monthList;
} }
...@@ -6982,6 +7362,16 @@ namespace Edu.Module.User ...@@ -6982,6 +7362,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
rateList.Add(new RB_Student_Company_Extend() rateList.Add(new RB_Student_Company_Extend()
{ {
YearStr = minYear + i, YearStr = minYear + i,
...@@ -7016,6 +7406,8 @@ namespace Edu.Module.User ...@@ -7016,6 +7406,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney,
}); });
} }
...@@ -7319,6 +7711,15 @@ namespace Edu.Module.User ...@@ -7319,6 +7711,15 @@ namespace Edu.Module.User
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
}); });
yearList.Add(new RateYearItem()
{
ItemName = "语培签约待收金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).OrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderNotMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderNotMoney, 2),
});
yearList.Add(new RateYearItem() yearList.Add(new RateYearItem()
{ {
ItemName = "留学签约金额", ItemName = "留学签约金额",
...@@ -7328,6 +7729,15 @@ namespace Edu.Module.User ...@@ -7328,6 +7729,15 @@ namespace Edu.Module.User
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
}); });
yearList.Add(new RateYearItem()
{
ItemName = "留学签约待收金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).StudyOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderNotMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderNotMoney, 2),
});
} }
return yearList; return yearList;
} }
...@@ -7514,6 +7924,16 @@ namespace Edu.Module.User ...@@ -7514,6 +7924,16 @@ namespace Edu.Module.User
{ {
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100; StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / firstModel.StudyOrderMoney * 100;
} }
decimal OrderNotMoney = 0;
if (firstModel.OrderNotMoney > 0 && i > 0)
{
OrderNotMoney = (item.OrderNotMoney - firstModel.OrderNotMoney) / firstModel.OrderNotMoney * 100;
}
decimal StudyOrderNotMoney = 0;
if (firstModel.StudyOrderNotMoney > 0 && i > 0)
{
StudyOrderNotMoney = (item.StudyOrderNotMoney - firstModel.StudyOrderNotMoney) / firstModel.StudyOrderNotMoney * 100;
}
var newModel = new RB_Student_Company_Extend() var newModel = new RB_Student_Company_Extend()
{ {
YearStr = minYear + y, YearStr = minYear + y,
...@@ -7549,6 +7969,8 @@ namespace Edu.Module.User ...@@ -7549,6 +7969,8 @@ namespace Edu.Module.User
ContractCount = ContractCount, ContractCount = ContractCount,
OrderMoney = OrderMoney, OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney, StudyOrderMoney = StudyOrderMoney,
OrderNotMoney = OrderNotMoney,
StudyOrderNotMoney = StudyOrderNotMoney
}; };
result.Add(newModel); result.Add(newModel);
} }
...@@ -8065,6 +8487,23 @@ namespace Edu.Module.User ...@@ -8065,6 +8487,23 @@ namespace Edu.Module.User
YearRate = Math.Round(COrderMoney, 2), YearRate = Math.Round(COrderMoney, 2),
}); });
var lastOrderNotMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.OrderNotMoney);
var curOrderNotMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.OrderNotMoney);
decimal COrderNotMoney = 0;
if (lastOrderNotMoney > 0)
{
COrderNotMoney = (curOrderNotMoney - lastOrderNotMoney) / lastOrderNotMoney * 100;
}
yearList.Add(new RateYearItem()
{
ItemName = "语培签约待收金额成长率",
FirstYearStr = minYear,
FirstYear = Math.Round(lastOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(curOrderNotMoney, 2),
YearRate = Math.Round(COrderNotMoney, 2),
});
var lastStudyOrderMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderMoney); var lastStudyOrderMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderMoney);
var curStudyOrderMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderMoney); var curStudyOrderMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderMoney);
decimal CStudyOrderMoney = 0; decimal CStudyOrderMoney = 0;
...@@ -8081,6 +8520,23 @@ namespace Edu.Module.User ...@@ -8081,6 +8520,23 @@ namespace Edu.Module.User
SecondYear = Math.Round(curStudyOrderMoney, 2), SecondYear = Math.Round(curStudyOrderMoney, 2),
YearRate = Math.Round(CStudyOrderMoney, 2), YearRate = Math.Round(CStudyOrderMoney, 2),
}); });
var lastStudyOrderNotMoney = result.Where(qitem => qitem.YearStr == minYear).Average(qitem => qitem.StudyOrderNotMoney);
var curStudyOrderNotMoney = result.Where(qitem => qitem.YearStr == maxYear).Average(qitem => qitem.StudyOrderNotMoney);
decimal CStudyOrderNotMoney = 0;
if (lastStudyOrderNotMoney > 0)
{
CStudyOrderNotMoney = (curStudyOrderNotMoney - lastStudyOrderNotMoney) / lastStudyOrderNotMoney * 100;
}
yearList.Add(new RateYearItem()
{
ItemName = "留学签约待收金额成长率",
FirstYearStr = minYear,
FirstYear = Math.Round(lastStudyOrderNotMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(curStudyOrderNotMoney, 2),
YearRate = Math.Round(CStudyOrderNotMoney, 2),
});
} }
return yearList; return yearList;
} }
...@@ -8142,6 +8598,8 @@ namespace Edu.Module.User ...@@ -8142,6 +8598,8 @@ namespace Edu.Module.User
ContractCount = procModel?.ContractCount ?? 0, ContractCount = procModel?.ContractCount ?? 0,
OrderMoney = procModel?.OrderMoney ?? 0, OrderMoney = procModel?.OrderMoney ?? 0,
StudyOrderMoney = procModel?.StudyOrderMoney ?? 0, StudyOrderMoney = procModel?.StudyOrderMoney ?? 0,
OrderNotMoney = procModel?.OrderNotMoney ?? 0,
StudyOrderNotMoney = procModel?.StudyOrderNotMoney ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -8196,6 +8654,8 @@ namespace Edu.Module.User ...@@ -8196,6 +8654,8 @@ namespace Edu.Module.User
ContractCount = lastMonthLastTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = lastMonthLastTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = lastMonthLastTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = lastMonthLastTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -8253,6 +8713,8 @@ namespace Edu.Module.User ...@@ -8253,6 +8713,8 @@ namespace Edu.Module.User
ContractCount = curMonthFirstTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthFirstTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthFirstTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthFirstTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -8310,6 +8772,8 @@ namespace Edu.Module.User ...@@ -8310,6 +8772,8 @@ namespace Edu.Module.User
ContractCount = curMonthSecondTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthSecondTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthSecondTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthSecondTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
...@@ -8375,6 +8839,8 @@ namespace Edu.Module.User ...@@ -8375,6 +8839,8 @@ namespace Edu.Module.User
ContractCount = curMonthThirdTimeList?.Sum(qitem => qitem.ContractCount) ?? 0, ContractCount = curMonthThirdTimeList?.Sum(qitem => qitem.ContractCount) ?? 0,
OrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0, OrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderMoney) ?? 0,
StudyOrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0, StudyOrderMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
OrderNotMoney = curMonthThirdTimeList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
StudyOrderNotMoney = curMonthThirdTimeList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
YearStr = newDate.Year, YearStr = newDate.Year,
MonthStr = newDate.Month, MonthStr = newDate.Month,
}; };
......
Edu.Repository/User/RB_Student_CompanyRepository.cs
View file @ 08bf409f
...@@ -66,7 +66,7 @@ SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,S ...@@ -66,7 +66,7 @@ SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,S
,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount ,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount
,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount ,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount
,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney ,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney
,SUM(A.StudyOrderMoney) AS StudyOrderMoney ,SUM(A.StudyOrderMoney) AS StudyOrderMoney,SUM(A.OrderNotMoney) AS OrderNotMoney,SUM(A.StudyOrderNotMoney) AS StudyOrderNotMoney
FROM RB_Student_Company AS A FROM RB_Student_Company AS A
WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
"); ");
...@@ -109,7 +109,7 @@ SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushC ...@@ -109,7 +109,7 @@ SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushC
,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount ,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount
,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount ,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount
,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney ,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney
,SUM(A.StudyOrderMoney) AS StudyOrderMoney ,SUM(A.StudyOrderMoney) AS StudyOrderMoney,SUM(A.OrderNotMoney) AS OrderNotMoney,SUM(A.StudyOrderNotMoney) AS StudyOrderNotMoney
FROM RB_Student_Company AS A FROM RB_Student_Company AS A
WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
"); ");
......
Edu.Repository/User/RB_Student_MarketRepository.cs
View file @ 08bf409f
...@@ -63,6 +63,7 @@ WHERE 1=1 ...@@ -63,6 +63,7 @@ WHERE 1=1
,SUM(A.OfficialAccount) AS OfficialAccount,SUM(A.TeacherRecommend) AS TeacherRecommend,SUM(A.ByteDance) AS ByteDance,SUM(A.ThirdPartyPlatform) AS ThirdPartyPlatform ,SUM(A.OfficialAccount) AS OfficialAccount,SUM(A.TeacherRecommend) AS TeacherRecommend,SUM(A.ByteDance) AS ByteDance,SUM(A.ThirdPartyPlatform) AS ThirdPartyPlatform
,SUM(A.Other) AS Other,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount ,SUM(A.Other) AS Other,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount
,SUM(A.InvalidCount) AS InvalidCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney,SUM(A.StudyOrderMoney) AS StudyOrderMoney ,SUM(A.InvalidCount) AS InvalidCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney,SUM(A.StudyOrderMoney) AS StudyOrderMoney
,SUM(A.OrderNotMoney) AS OrderNotMoney,SUM(A.StudyOrderNotMoney) AS StudyOrderNotMoney
FROM RB_Student_Market AS A FROM RB_Student_Market AS A
WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
"); ");
...@@ -104,6 +105,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' ...@@ -104,6 +105,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
,SUM(A.OfficialAccount) AS OfficialAccount,SUM(A.TeacherRecommend) AS TeacherRecommend,SUM(A.ByteDance) AS ByteDance,SUM(A.ThirdPartyPlatform) AS ThirdPartyPlatform ,SUM(A.OfficialAccount) AS OfficialAccount,SUM(A.TeacherRecommend) AS TeacherRecommend,SUM(A.ByteDance) AS ByteDance,SUM(A.ThirdPartyPlatform) AS ThirdPartyPlatform
,SUM(A.Other) AS Other,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount ,SUM(A.Other) AS Other,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount
,SUM(A.InvalidCount) AS InvalidCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney,SUM(A.StudyOrderMoney) AS StudyOrderMoney ,SUM(A.InvalidCount) AS InvalidCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney,SUM(A.StudyOrderMoney) AS StudyOrderMoney
,SUM(A.OrderNotMoney) AS OrderNotMoney,SUM(A.StudyOrderNotMoney) AS StudyOrderNotMoney
FROM RB_Student_Market AS A FROM RB_Student_Market AS A
WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
"); ");
......
Edu.Repository/User/RB_Student_StaticRepository.cs
View file @ 08bf409f
...@@ -67,7 +67,7 @@ SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,S ...@@ -67,7 +67,7 @@ SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,S
,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount ,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount
,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount ,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount
,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney ,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney
,SUM(A.StudyOrderMoney) AS StudyOrderMoney ,SUM(A.StudyOrderMoney) AS StudyOrderMoney,SUM(A.OrderNotMoney) AS OrderNotMoney,SUM(A.StudyOrderNotMoney) AS StudyOrderNotMoney
FROM RB_Student_Static AS A FROM RB_Student_Static AS A
WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
"); ");
...@@ -110,7 +110,7 @@ SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushC ...@@ -110,7 +110,7 @@ SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushC
,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount ,SUM(A.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount
,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount ,SUM(A.InnerCount) AS InnerCount,SUM(A.InvalidCount) AS InvalidCount,SUM(A.SuspectedCount) AS SuspectedCount,SUM(A.IntentionCount) AS IntentionCount
,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney ,SUM(A.InvitationCount) AS InvitationCount,SUM(A.NegotiationCount) AS NegotiationCount,SUM(A.ContractCount) AS ContractCount,SUM(A.OrderMoney) AS OrderMoney
,SUM(A.StudyOrderMoney) AS StudyOrderMoney ,SUM(A.StudyOrderMoney) AS StudyOrderMoney,SUM(A.OrderNotMoney) AS OrderNotMoney,SUM(A.StudyOrderNotMoney) AS StudyOrderNotMoney
FROM RB_Student_Static AS A FROM RB_Student_Static AS A
WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
"); ");
......
Edu.WebApi/Controllers/User/StudentStatController.cs
View file @ 08bf409f
...@@ -572,7 +572,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -572,7 +572,9 @@ namespace Edu.WebApi.Controllers.User
new ExcelColumn("谈判"){ CellWidth=15}, new ExcelColumn("谈判"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15}, new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15}, new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15}, new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -613,7 +615,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -613,7 +615,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
...@@ -700,7 +704,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -700,7 +704,9 @@ namespace Edu.WebApi.Controllers.User
new ExcelColumn("谈判"){ CellWidth=15}, new ExcelColumn("谈判"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15}, new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15}, new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15}, new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -741,7 +747,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -741,7 +747,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
...@@ -1098,7 +1106,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1098,7 +1106,9 @@ namespace Edu.WebApi.Controllers.User
new ExcelColumn("无效"){ CellWidth=15}, new ExcelColumn("无效"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15}, new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15}, new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15}, new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -1133,7 +1143,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1133,7 +1143,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
...@@ -1214,7 +1226,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1214,7 +1226,9 @@ namespace Edu.WebApi.Controllers.User
new ExcelColumn("无效"){ CellWidth=15}, new ExcelColumn("无效"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15}, new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15}, new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15}, new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -1249,7 +1263,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1249,7 +1263,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
...@@ -1574,7 +1590,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1574,7 +1590,9 @@ namespace Edu.WebApi.Controllers.User
new ExcelColumn("谈判"){ CellWidth=15}, new ExcelColumn("谈判"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15}, new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15}, new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15}, new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -1615,7 +1633,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1615,7 +1633,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
...@@ -1702,7 +1722,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1702,7 +1722,9 @@ namespace Edu.WebApi.Controllers.User
new ExcelColumn("谈判"){ CellWidth=15}, new ExcelColumn("谈判"){ CellWidth=15},
new ExcelColumn("签约.成交.续费"){ CellWidth=15}, new ExcelColumn("签约.成交.续费"){ CellWidth=15},
new ExcelColumn("语培签约金额"){ CellWidth=15}, new ExcelColumn("语培签约金额"){ CellWidth=15},
new ExcelColumn("语培签约待收金额"){ CellWidth=15},
new ExcelColumn("留学签约金额"){ CellWidth=15}, new ExcelColumn("留学签约金额"){ CellWidth=15},
new ExcelColumn("留学签约待收金额"){ CellWidth=15},
} }
}; };
slist.Add(header); slist.Add(header);
...@@ -1743,7 +1765,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1743,7 +1765,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource() var dataRow = new ExcelDataSource()
{ {
ExcelRows = columns ExcelRows = columns
......
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