Skip to content

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

页面修改

parent f1970a59
Expand all 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
/// 创建时间
/// </summary>
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
/// 创建时间
/// </summary>
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
/// 创建时间
/// </summary>
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
This diff is collapsed.
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
,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.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
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
,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.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
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
,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.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
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.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.OrderNotMoney) AS OrderNotMoney,SUM(A.StudyOrderNotMoney) AS StudyOrderNotMoney
FROM RB_Student_Market AS A
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
,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.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
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
,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.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
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
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);
......@@ -613,7 +615,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
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("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource()
{
ExcelRows = columns
......@@ -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},
}
};
slist.Add(header);
......@@ -741,7 +747,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
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("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource()
{
ExcelRows = columns
......@@ -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},
}
};
slist.Add(header);
......@@ -1133,7 +1143,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
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("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource()
{
ExcelRows = columns
......@@ -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},
}
};
slist.Add(header);
......@@ -1249,7 +1263,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
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("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource()
{
ExcelRows = columns
......@@ -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},
}
};
slist.Add(header);
......@@ -1615,7 +1633,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
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("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource()
{
ExcelRows = columns
......@@ -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},
}
};
slist.Add(header);
......@@ -1743,7 +1765,9 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("NegotiationCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ContractCount")));
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("StudyOrderNotMoney")));
var dataRow = new ExcelDataSource()
{
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