Skip to content

E
Education
Commit 14fd1237 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent cc5936ab
Show whitespace changes
Inline Side-by-side
Showing with 189 additions and 27 deletions
Edu.Model/Entity/Sell/RB_Sell_Achievements_Details.cs
View file @ 14fd1237
......@@ -147,5 +147,15 @@ namespace Edu.Model.Entity.Sell
/// </summary>
public decimal PeopleNumMoney { get; set; }
/// <summary>
/// 是否 部门共同奖金 1是
/// </summary>
public int IsCommonDept { get; set; }
/// <summary>
/// 订单业绩
/// </summary>
public decimal OrderSaleMoney { get; set; }
}
}
Edu.Model/Entity/Sell/RB_Sell_Achievements_Emp.cs
View file @ 14fd1237
......@@ -92,5 +92,10 @@ namespace Edu.Model.Entity.Sell
/// </summary>
public decimal PeopleNumMoney { get; set; }
/// <summary>
/// 是否 部门共同奖金 1是
/// </summary>
public int IsCommonDept { get; set; }
}
}
Edu.Model/Entity/Sell/RB_Sell_Achievements_Rule.cs
View file @ 14fd1237
......@@ -122,5 +122,15 @@ namespace Edu.Model.Entity.Sell
/// </summary>
public string ZGAwardRule { get; set; }
/// <summary>
/// 是否部门共同奖金
/// </summary>
public int IsDeptAward { get; set; }
/// <summary>
/// 部门分配规则
/// </summary>
public string DeptAwardAllotRule { get; set; }
}
}
Edu.Model/ViewModel/Sell/RB_Sell_Achievements_Rule_ViewModel.cs
View file @ 14fd1237
......@@ -41,6 +41,11 @@ namespace Edu.Model.ViewModel.Sell
/// 业绩比例
/// </summary>
public List<AchievementsRateModel> ZGAwardList { get; set; }
/// <summary>
/// 部门分配规则
/// </summary>
public List<DeptAllotModel> DeptAwardList { get; set; }
}
/// <summary>
......@@ -60,4 +65,22 @@ namespace Edu.Model.ViewModel.Sell
/// </summary>
public decimal Rate { get; set; }
}
/// <summary>
/// 共同奖金包分配
/// </summary>
public class DeptAllotModel {
/// <summary>
/// 人员ID
/// </summary>
public int EmpId { get; set; }
/// <summary>
/// 人员姓名
/// </summary>
public string EmName { get; set; }
/// <summary>
/// 分配比例
/// </summary>
public decimal Rate { get; set; }
}
}
\ No newline at end of file
Edu.Module.Course/SellAchievementsModule.cs
View file @ 14fd1237
......@@ -172,6 +172,11 @@ namespace Edu.Module.Course
{
item.ZGAwardList = JsonHelper.DeserializeObject<List<AchievementsRateModel>>(item.ZGAwardRule);
}
item.DeptAwardList = new List<DeptAllotModel>();
if (!string.IsNullOrEmpty(item.DeptAwardAllotRule))
{
item.DeptAwardList = JsonHelper.DeserializeObject<List<DeptAllotModel>>(item.DeptAwardAllotRule);
}
item.CourseList = courseList.Where(x => ("," + item.CourseIds + ",").Contains("," + x.CourseId + ",")).ToList();
item.EmpList = empList.Where(x => ("," + item.EmpIds + ",").Contains("," + x.Id + ",")).ToList();
item.ChildEmpList = new List<Employee_ViewModel>();
......@@ -242,6 +247,8 @@ namespace Edu.Module.Course
{ nameof(RB_Sell_Achievements_Rule_ViewModel.ExtraMoney), demodel.ExtraMoney},
{ nameof(RB_Sell_Achievements_Rule_ViewModel.EnableZGAward), demodel.EnableZGAward},
{ nameof(RB_Sell_Achievements_Rule_ViewModel.ZGAwardRule), demodel.ZGAwardRule},
{ nameof(RB_Sell_Achievements_Rule_ViewModel.DeptAwardAllotRule), demodel.DeptAwardAllotRule},
{ nameof(RB_Sell_Achievements_Rule_ViewModel.IsDeptAward), demodel.IsDeptAward},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
......@@ -322,11 +329,55 @@ namespace Edu.Module.Course
var list = sell_Achievements_DetailsRepository.GetSellCommissionUserList(dmodel);
if (list.Any())
{
//首先 根据共同奖金分配规则 分配
if (list.Where(x => x.IsCommonDept == 1).Any())
{
var CommionList = list.Where(x => x.IsCommonDept == 1).ToList();
list = list.Where(x => x.IsCommonDept != 1).ToList();
int TotalNum = CommionList.Sum(x => x.StudentCount);
decimal Money = CommionList.Sum(x => x.CurrentPeriodMoney);
decimal PeopleMoney = CommionList.Sum(x => x.PeopleNumMoney);
//开始拆分
var empData = sell_Achievements_EmpRepository.GetList(new RB_Sell_Achievements_Emp_ViewModel() { Type = 1, EmpId = CommionList.FirstOrDefault().UserId, PeriodsId = dmodel.PeriodId });
if (empData.Where(x => x.RuleId > 0).Any())
{
//查询规则
var ruleModel = sell_Achievements_RuleRepository.GetEntity<RB_Sell_Achievements_Rule_ViewModel>(empData.Where(x => x.RuleId > 0).FirstOrDefault().RuleId);
ruleModel.DeptAwardList = new List<DeptAllotModel>();
if (!string.IsNullOrEmpty(ruleModel.DeptAwardAllotRule))
{
ruleModel.DeptAwardList = JsonHelper.DeserializeObject<List<DeptAllotModel>>(ruleModel.DeptAwardAllotRule);
}
foreach (var item in ruleModel.DeptAwardList)
{
list.Add(new RB_Sell_Achievements_Details_ViewModel()
{
UserId = item.EmpId,
Depart_Id = -1,
School_Id = -1,
IsCommonDept = 1,
StudentCount = TotalNum,
CurrentPeriodMoney = Math.Round(Money * item.Rate / 100, 2, MidpointRounding.AwayFromZero),
PeopleNumMoney = Math.Round(PeopleMoney * item.Rate / 100, 2, MidpointRounding.AwayFromZero),
});
}
}
}
//查询用户 部门 校区
string userIds = string.Join(",", list.Select(x => x.UserId).Distinct());
var ulist = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Group_Id = dmodel.Group_Id, QIds = userIds });
foreach (var item in list.Where(x => x.Depart_Id == -1 || x.School_Id == -1))
{
var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
item.Depart_Id = umodel.Dept_Id;
item.School_Id = umodel.School_Id;
}
string deptIds = string.Join(",", list.Select(x => x.Depart_Id).Distinct());
string schoolIds = string.Join(",", list.Select(x => x.School_Id).Distinct());
var ulist = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Group_Id = dmodel.Group_Id, QIds = userIds });
var dlist = departmentRepository.GetDepartmentListRepository(new RB_Department_ViewModel() { Group_Id = dmodel.Group_Id, QDeptIds = deptIds });
var slist = schoolRepository.GetSchoolListRepository(new RB_School_ViewModel() { Group_Id = dmodel.Group_Id, QSIds = schoolIds });
......@@ -421,7 +472,13 @@ namespace Edu.Module.Course
foreach (var item in list)
{
var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
if (item.IsCommonDept == 1) {
item.UserName = "-";
}
else
{
item.UserName = umodel.EmployeeName + (umodel.LeaveStatus == Common.Enum.User.LeaveStatusEnum.Departure ? "离职" : "");
}
item.DeptName = dlist.Where(x => x.DeptId == item.Depart_Id).FirstOrDefault()?.DeptName ?? "";
item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
......@@ -466,7 +523,14 @@ namespace Edu.Module.Course
foreach (var item in list)
{
var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
if (item.IsCommonDept == 1)
{
item.UserName = "-";
}
else
{
item.UserName = umodel.EmployeeName + (umodel.LeaveStatus == Common.Enum.User.LeaveStatusEnum.Departure ? "离职" : "");
}
item.DeptName = dlist.Where(x => x.DeptId == item.Depart_Id).FirstOrDefault()?.DeptName ?? "";
item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
......@@ -767,7 +831,7 @@ namespace Edu.Module.Course
string SchoolIds = string.Join(",", rulelist.Select(x => x.SchoolIds));
//查询 班级订单 1.尾款收齐
string SDate = "2024-08-01";
string SDate = "2023-11-01";
string EDate = Convert.ToDateTime(month + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
var orderList = orderRepository.GetAllAchievementsSendOrderList(userInfo.Group_Id, SDate, EDate, 1, "", SchoolIds, languageRuleList, 1);//查询所有的
List<RB_Sell_Achievements_Emp_ViewModel> AchEmpList = new List<RB_Sell_Achievements_Emp_ViewModel>();//需要新增当月的
......@@ -776,14 +840,6 @@ namespace Edu.Module.Course
//查询历史所有 退费的单子 汇总金额计入其当月的业绩计算 并回扣所有订单的提成(是 2023-10月这一期开始 回扣提成 ) PeriodId =64 开始扣提成
//首先查询 所有退费的单子
var ROrderList = sell_Achievements_EmpRepository.GetAllRefundWaitPendingList(userInfo.Group_Id);
if (ROrderList.Any()) {
string orderIds = string.Join(",", ROrderList.Select(x => x.OrderId));
var bdList = order_ReturnComissionRepository.GetOrderReturnComissionListRepositpry(new RB_Order_ReturnComission_ViewModel() { GroupId = userInfo.Group_Id, QOrderIds = orderIds });
foreach (var item in ROrderList) {
decimal bdCommission = bdList.Where(x => x.OrderId == item.OrderId).Sum(x => x.CommissionMoeny);
item.OrderMoney -= bdCommission;
}
}
#endregion
if (orderList.Any())
......@@ -802,6 +858,11 @@ namespace Edu.Module.Course
{
item.ZGAwardList = JsonHelper.DeserializeObject<List<AchievementsRateModel>>(item.ZGAwardRule);
}
item.DeptAwardList = new List<DeptAllotModel>();
if (!string.IsNullOrEmpty(item.DeptAwardAllotRule))
{
item.DeptAwardList = JsonHelper.DeserializeObject<List<DeptAllotModel>>(item.DeptAwardAllotRule);
}
}
//根据订单 查询同行返佣
string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
......@@ -1025,6 +1086,10 @@ namespace Edu.Module.Course
sellOrderList = sellOrderList.Where(x => x.JoinType != Common.Enum.Sale.OrderJoinTypeEnum.RenewOrder).ToList();//市场排除续费订单
if (sellOrderList.Any())
{
if (item.IsDeptAward == 1)
{
sellOrderList.ForEach(x => x.EnterID = item.DeptAwardList.OrderByDescending(x => x.Rate).FirstOrDefault().EmpId);// 全部放到拿最多的那个人身上
}
//计算一下 退费金额，要算入当期的业绩里
decimal TRefund = ROrderList.Where(x => ("," + item.EmpIds + ",").Contains("," + x.EmpId + ",")).Sum(x => x.Remark.Contains("销售额减半计算") ? (x.OrderMoney - x.OrderSaleMoney) / 2 : x.OrderMoney - x.OrderSaleMoney);
//计算市场业绩 如果有 老师提成，
......@@ -1074,6 +1139,7 @@ namespace Edu.Module.Course
OrderSaleMoney = orderYj,
PeopleNumMoney = qitem.Refund <= 0 ? awardModel?.Rate ?? 0 : 0,
Type = 1,
IsCommonDept = item.IsDeptAward,
Remark = "当月业绩：" + TotalYj + (TRefund != 0 ? "(其中退费:" + TRefund + ")" : "") + "；订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYj + (qitem.HelpEnterId > 0 ? "；此单由试听转化，销售额减半计算" : "") + "；当月部门人头：" + PeopleNum + "人，人头奖励：" + (awardModel?.Rate ?? 0)
});
}
......@@ -1104,6 +1170,7 @@ namespace Edu.Module.Course
OrderSaleMoney = orderYj,
PeopleNumMoney = qitem.Refund <= 0 ? awardModel?.Rate ?? 0 : 0,
Type = 1,
IsCommonDept = item.IsDeptAward,
Remark = "当月业绩：" + TotalYj + (TRefund != 0 ? "(其中退费:" + TRefund + ")" : "") + "；订单b2b返佣：" + bdCommission + "；订单业绩:" + orderYj + (qitem.HelpEnterId > 0 ? "；此单由试听转化，销售额减半计算" : "") + "；当月部门人头：" + PeopleNum + "人，人头奖励：" + (awardModel?.Rate ?? 0)+"，业绩不达标，只发放人头奖励"
});
}
......@@ -1497,6 +1564,7 @@ namespace Edu.Module.Course
GiveOutMoney = Math.Round((qitem.OrderMoney - qitem.OrderSaleMoney) * qitem.Rate / 100, 2, MidpointRounding.AwayFromZero),
GiveOutState = 1,
IsDept = qitem.IsDept,
IsCommonDept = qitem.IsCommonDept,
PeriodsId = 0,
SaleMoney = 0,
Remark = "退款回扣提成，此单" + month + "退款:" + (qitem.OrderMoney - qitem.OrderSaleMoney),
......@@ -1636,7 +1704,8 @@ namespace Edu.Module.Course
IsDept = AchModel.IsDept,
UserType = AchModel.Type,
RelatedId = AchModel.Id,
PeopleNumMoney = 0
PeopleNumMoney = 0,
IsCommonDept = AchModel.IsCommonDept
});
AchModel.GiveOutMoney = SaleCommissioned;
......@@ -1674,7 +1743,8 @@ namespace Edu.Module.Course
IsDept = AchModel.IsDept,
UserType = AchModel.Type,
RelatedId = AchModel.Id,
PeopleNumMoney = AchModel.PeopleNumMoney
PeopleNumMoney = AchModel.PeopleNumMoney,
IsCommonDept = AchModel.IsCommonDept
});
AchModel.GiveOutMoney = YFCommission;
AchModel.GiveOutState = 1;
......@@ -1738,7 +1808,9 @@ namespace Edu.Module.Course
IsDept = AchModel.IsDept,
UserType = AchModel.Type,
RelatedId = AchModel.Id,
PeopleNumMoney = AchModel.PeopleNumMoney
PeopleNumMoney = AchModel.PeopleNumMoney,
IsCommonDept = AchModel.IsCommonDept,
OrderSaleMoney = AchModel.OrderSaleMoney
});
AchModel.GiveOutMoney = FirstMoney;
if (ruleModel.FirstRate == 100)
......@@ -1776,7 +1848,9 @@ namespace Edu.Module.Course
IsDept = AchModel.IsDept,
UserType = AchModel.Type,
RelatedId = AchModel.Id,
PeopleNumMoney = 0
PeopleNumMoney = 0,
IsCommonDept = AchModel.IsCommonDept,
OrderSaleMoney = AchModel.OrderSaleMoney
});
}
}
......@@ -1835,6 +1909,7 @@ namespace Edu.Module.Course
detailModel.RelatedId = AchEmpList.Where(x => x.Remark.Contains("退款回扣") && x.OrderId == qitem.OrderId && x.EmpId == qitem.EmpId && x.Type == qitem.Type).FirstOrDefault()?.Id ?? 0;
detailModel.FirstRate = 100;
detailModel.PeopleNumMoney = qitem.Refund > 0 ? 0 - qitem.PeopleNumMoney : 0;
detailModel.OrderSaleMoney = qitem.OrderMoney - qitem.OrderSaleMoney;
CurrentList.Add(JsonHelper.DeserializeObject<RB_Sell_Achievements_Details_ViewModel>(JsonHelper.Serialize(detailModel)));
}
}
......
Edu.Repository/Sell/RB_Sell_Achievements_DetailsRepository.cs
View file @ 14fd1237
......@@ -65,6 +65,10 @@ namespace Edu.Repository.Sell
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
}
if (demodel.IsCommonDept > 0)
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsCommonDept)} ={demodel.IsCommonDept}";
}
if (demodel.RelatedId > 0)
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.RelatedId)} ={demodel.RelatedId}";
......@@ -119,6 +123,10 @@ namespace Edu.Repository.Sell
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
}
if (demodel.IsCommonDept > 0)
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsCommonDept)} ={demodel.IsCommonDept}";
}
string sql = $@" select r.*,
......@@ -175,6 +183,10 @@ from RB_Sell_Achievements_Details r where {where} order by r.Id asc";
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
}
if (demodel.IsCommonDept > 0)
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsCommonDept)} ={demodel.IsCommonDept}";
}
string sql = $@" select r.* from RB_Sell_Achievements_Details r where {where} order by r.Id desc";
return GetPage<RB_Sell_Achievements_Details_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
......@@ -223,8 +235,8 @@ from RB_Sell_Achievements_Details r where {where} order by r.Id asc";
}
string sql = $@" select r.UserId,r.Depart_Id,r.School_Id,sum(r.StudentCount) as StudentCount,sum(r.CurrentPeriodMoney + r.DeductionMoney) as CurrentPeriodMoney,sum(r.PeopleNumMoney) as PeopleNumMoney
from RB_Sell_Achievements_Details r where {where} group by r.UserId,r.Depart_Id,r.School_Id";
string sql = $@" select r.UserId,r.Depart_Id,r.School_Id,r.IsCommonDept,sum(r.StudentCount) as StudentCount,sum(r.CurrentPeriodMoney + r.DeductionMoney) as CurrentPeriodMoney,sum(r.PeopleNumMoney) as PeopleNumMoney
from RB_Sell_Achievements_Details r where {where} group by r.UserId,r.Depart_Id,r.School_Id,r.IsCommonDept";
return Get<RB_Sell_Achievements_Details_ViewModel>(sql).ToList();
}
......@@ -288,6 +300,10 @@ GROUP BY PeriodId ";
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
}
if (demodel.IsCommonDept > 0)
{
where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsCommonDept)} ={demodel.IsCommonDept}";
}
string sql = $@" select sum(r.CurrentPeriodMoney + r.DeductionMoney + r.PeopleNumMoney) from RB_Sell_Achievements_Details r where {where}";
......
Edu.Repository/Sell/RB_Sell_Achievements_EmpRepository.cs
View file @ 14fd1237
......@@ -188,9 +188,10 @@ GROUP BY e.Type,e.EmpId,e.Rate,e.IsDept,p.Periods";
/// <returns></returns>
public List<RB_Sell_Achievements_Emp_ViewModel> GetAllRefundWaitPendingList(int group_Id)
{
string sql = $@"SELECT e.*,(o.Income - o.Refund - o.TextbookFee) as OrderMoney,o.Refund FROM rb_sell_achievements_emp e
string sql = $@"SELECT e.*,(o.Income - o.Refund - o.TextbookFee - IFNULL(r.CommissionMoeny,0)) as OrderMoney,o.Refund FROM rb_sell_achievements_emp e
LEFT JOIN rb_order o on e.OrderId =o.OrderId
WHERE e.Group_Id={group_Id} and o.CreateTime >='2024-08-01' and e.GiveOutState =1 and (e.Type=2 or (e.Type=1 and e.IsDept=1)) and o.PreferPrice >0 and e.OrderSaleMoney <> (o.Income - o.Refund - o.TextbookFee) and e.OrderId>0 and e.Remark not like '%退款回扣%'
left join rb_order_returncomission r on o.OrderId =r.OrderId and r.CommissionType =1
WHERE e.Group_Id={group_Id} and o.CreateTime >='2024-09-01' and e.GiveOutState =1 and (e.Type=2 or (e.Type=1 and e.IsDept=1)) and o.PreferPrice >0 and e.OrderSaleMoney <> (o.Income - o.Refund - o.TextbookFee - IFNULL(r.CommissionMoeny,0)) and e.OrderId>0 and e.Remark not like '%退款回扣%'
ORDER BY e.OrderId ASC ";
return Get<RB_Sell_Achievements_Emp_ViewModel>(sql).ToList();
}
......
Edu.WebApi/Controllers/Course/SellAchievementsController.cs
View file @ 14fd1237
......@@ -72,6 +72,8 @@ namespace Edu.WebApi.Controllers.Course
x.ExtraMoney,
x.EnableZGAward,
x.ZGAwardList,
x.DeptAwardList,
x.IsDeptAward,
CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
}));
}
......@@ -150,6 +152,17 @@ namespace Edu.WebApi.Controllers.Course
else {
demodel.ZGAwardRule = "";
}
if (demodel.IsDeptAward == 1)
{
if (demodel.DeptAwardList == null || !demodel.DeptAwardList.Any())
{
return ApiResult.ParamIsNull("请传递部门共同奖金分配规则");
}
demodel.DeptAwardAllotRule = JsonHelper.Serialize(demodel.DeptAwardList);
}
else {
demodel.DeptAwardAllotRule = "";
}
demodel.Status = 0;
demodel.Group_Id = userInfo.Group_Id;
demodel.CreateBy = userInfo.Id;
......@@ -266,7 +279,8 @@ namespace Edu.WebApi.Controllers.Course
x.UserName,
x.StudentCount,
x.CurrentPeriodMoney,
x.PeopleNumMoney
x.PeopleNumMoney,
x.IsCommonDept
}));
}
......@@ -293,7 +307,7 @@ namespace Edu.WebApi.Controllers.Course
x.Depart_Id,
x.DeptName,
x.UserId,
x.UserName,
UserName = x.IsCommonDept == 1 ? "-" : x.UserName,
x.ClassId,
x.ClassName,
x.ClassNo,
......@@ -315,7 +329,9 @@ namespace Edu.WebApi.Controllers.Course
YFMoney = x.CurrentPeriodMoney + x.DeductionMoney,
x.UserType,
x.IsDept,
x.PeopleNumMoney
x.PeopleNumMoney,
x.IsCommonDept,
x.OrderSaleMoney
}));
}
......@@ -363,7 +379,9 @@ namespace Edu.WebApi.Controllers.Course
YFMoney = x.CurrentPeriodMoney + x.DeductionMoney,
x.UserType,
x.IsDept,
x.PeopleNumMoney
x.PeopleNumMoney,
x.IsCommonDept,
x.OrderSaleMoney
}));
}
......@@ -412,7 +430,9 @@ namespace Edu.WebApi.Controllers.Course
YFMoney = x.CurrentPeriodMoney + x.DeductionMoney,
x.UserType,
x.IsDept,
x.PeopleNumMoney
x.PeopleNumMoney,
x.IsCommonDept,
x.OrderSaleMoney
})
};
return ApiResult.Success("", pageModel);
......@@ -443,6 +463,7 @@ namespace Edu.WebApi.Controllers.Course
new ExcelColumn(value: "班级类型") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "学生数量") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "订单号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "订单业绩") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "订单应发") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "累计已发") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "首次发放") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
......@@ -475,6 +496,7 @@ namespace Edu.WebApi.Controllers.Course
new ExcelColumn(value: item.UserName){ },
new ExcelColumn(value: item.IsDept==1?"部门":"个人"){ },
new ExcelColumn(value: item.ClassNo){ },
new ExcelColumn(value: item.OrderSaleMoney.ToString("#0.00")){ },
new ExcelColumn(value: item.ClassName){ },
new ExcelColumn(value: item.ClassTypeName){ },
new ExcelColumn(value: item.StudentCount.ToString()){ },
......
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