Skip to content

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

页面修改

parent 2a575a28
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 5 deletions
Edu.Module.Course/EmployeeBonusModule.cs
View file @ a46a76d1
......@@ -357,7 +357,7 @@ namespace Edu.Module.Course
/// <param name="saleId"></param>
private void CalcPersionBonusModule(RB_Personnel_Period period, RB_Bonus_PlanExtend item, int GroupId, string startDate, string endDate, int saleId)
{
var orderList = GetSaleOrderList(item, GroupId,startDate,endDate, saleId, out List<RB_Order_ViewModel> allOrderList);
var orderList = GetSaleOrderList(item, GroupId,startDate,endDate, saleId, out List<RB_Order_ViewModel> allOrderList,out int IsOpenOrder);
var curNum = orderList?.Sum(qitem => qitem.GuestNum) ?? 0;
var curOrderMoney = orderList?.Sum(qitem => qitem.OrderMoney) ?? 0;
......@@ -392,7 +392,7 @@ namespace Edu.Module.Course
UpdateBy = 1,
UpdateTime = DateTime.Now,
DeductionMoney = DeductionMoney,
OpenBonus = curNum > 0 ? item.OpenBonus : 0,
OpenBonus = IsOpenOrder > 0 ? item.OpenBonus : 0,
ClueNum = ClueCount,
ClueNumSalary = ClueCount > 5 ? item.ClueNumSalary : 0,
IsIssue = 0
......@@ -536,10 +536,13 @@ namespace Edu.Module.Course
/// </summary>
/// <param name="item"></param>
/// <param name="GroupId"></param>
/// <param name="startDate"></param>
/// <param name="endDate"></param>
/// <param name="SaleId"></param>
/// <param name="orderList"></param>
/// <param name="isOpenOrder">是否有开单</param>
/// <returns></returns>
private List<PersionOrderItem> GetSaleOrderList(RB_Bonus_PlanExtend item, int GroupId,string startDate,string endDate, int SaleId, out List<RB_Order_ViewModel> orderList)
private List<PersionOrderItem> GetSaleOrderList(RB_Bonus_PlanExtend item, int GroupId,string startDate,string endDate, int SaleId, out List<RB_Order_ViewModel> orderList,out int isOpenOrder)
{
List<PersionOrderItem> list = new List<PersionOrderItem>();
//所有当前人员订单列表
......@@ -549,6 +552,7 @@ namespace Edu.Module.Course
{
orderList = orderList?.Where(qitem => item.UseCourseIds.Contains(qitem.CourseId.ToString()))?.ToList();
}
isOpenOrder= orderList.Count>0?1:0;
//不适用课程
if (!string.IsNullOrEmpty(item.NotUseCourseIds))
{
......@@ -684,7 +688,7 @@ namespace Edu.Module.Course
if (saleId == user.Id)
{
string endDate = Common.ConvertHelper.FormatDate(endTime);
var orderList = GetSaleOrderList(item, user.Group_Id,startDate,endDate, saleId, out List<RB_Order_ViewModel> allOrderList);
var orderList = GetSaleOrderList(item, user.Group_Id,startDate,endDate, saleId, out List<RB_Order_ViewModel> allOrderList,out int IsOpenOrder);
monthData.GuestNum = orderList?.Sum(qitem => qitem.GuestNum) ?? 0;
monthData.OrderCount = allOrderList?.Count() ?? 0;
monthData.ReachCount = item.MonthGoalMoney > (orderList?.Sum(qitem => qitem.OrderMoney) ?? 0) ? 1 : 0;
......@@ -692,7 +696,7 @@ namespace Edu.Module.Course
//当月梯度奖励金额
decimal CurRewardMoney = GetStepAwardAmount(item, monthData.GuestNum);
//开单奖金
decimal OpenBonus = monthData.GuestNum > 0 ? item.OpenBonus : 0;
decimal OpenBonus = IsOpenOrder > 0 ? item.OpenBonus : 0;
//线索奖励
var stuModel = studentRepository.GetStudentStaticRepository(saleId.ToString(), startDate, endDate)?.FirstOrDefault();
decimal ClueNumSalary = stuModel?.ClueCount > 5 ? item.ClueNumSalary : 0;
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ a46a76d1
......@@ -770,6 +770,144 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 导出学员信息
/// </summary>
/// <returns></returns>
[HttpPost]
[Obsolete]
public FileContentResult DownLoadStudent()
{
List<ExcelDataSource> slist = new List<ExcelDataSource>();
var query = new RB_Student_ViewModel()
{
StuName = base.ParmJObj.GetStringValue("StuName"),
StuTel = base.ParmJObj.GetStringValue("StuTel"),
CreateBy = base.ParmJObj.GetInt("CreateBy"),
IsQueryMyStu = base.ParmJObj.GetInt("IsQueryMyStu"),
CustomerId = base.ParmJObj.GetInt("CustomerId"),
StuStage = base.ParmJObj.GetInt("StuStage"),
StartTime = base.ParmJObj.GetStringValue("StartTime"),
EndTime = base.ParmJObj.GetStringValue("EndTime"),
BelongType = base.ParmJObj.GetInt("BelongType"),
QStudentType = base.ParmJObj.GetInt("QStudentType", -1),
QQ = base.ParmJObj.GetStringValue("QQ"),
WeChatNo = base.ParmJObj.GetStringValue("WeChatNo"),
StuType = base.ParmJObj.GetInt("StuType"),
ExistCourseConsultant = base.ParmJObj.GetInt("ExistCourseConsultant"),
CategoryId = base.ParmJObj.GetInt("CategoryId"),
};
if (query.IsQueryMyStu == 1)
{
query.CreateBy = base.UserInfo.Id;
}
string CreateIds = base.ParmJObj.GetStringValue("CreateIds");
if (!string.IsNullOrEmpty(CreateIds))
{
query.CreateIds = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(CreateIds);
}
int PlanId = base.ParmJObj.GetInt("PlanId");
if (PlanId > 0)
{
var planModel = dutyPlanModule.GetDutyPlanModule(PlanId);
string planDate = Common.ConvertHelper.FormatDate(planModel.Date);
if (!string.IsNullOrEmpty(planDate))
{
query.QDate = planDate;
}
}
query.Group_Id = base.UserInfo.Group_Id;
string excelName = "客户资料.xls";
var list = studentModule.GetStudentPageListModule(1, 1000000, out long rowsCount, query);
try
{
ExcelDataSource header = new ExcelDataSource();
header.ExcelRows = new List<ExcelColumn>()
{
new ExcelColumn("昵称"),
new ExcelColumn("课程顾问"),
new ExcelColumn("协助老师"),
new ExcelColumn("是否报名"),
new ExcelColumn("性别"),
new ExcelColumn("电话"),
new ExcelColumn("QQ"),
new ExcelColumn("微信"),
new ExcelColumn("客户类型"),
new ExcelColumn("客户阶段"),
new ExcelColumn("客户需求"),
new ExcelColumn("职业"),
new ExcelColumn("学历"),
new ExcelColumn("目的"),
new ExcelColumn("其他服务人员"),
new ExcelColumn("客户来源"),
new ExcelColumn("来源关联人"),
new ExcelColumn("收客渠道"),
new ExcelColumn("到访次数"),
new ExcelColumn("试听次数"),
new ExcelColumn("创建时间"),
new ExcelColumn("负责人"),
};
slist.Add(header);
foreach (var item in list)
{
var courseManager = item?.AssistList?.Where(qtiem => qtiem.AssistType == AssistTypeEnum.CourseAdviser)?.FirstOrDefault();
string course = courseManager?.AssistName ?? "暂未推送";
var teacherManager= item?.AssistList?.Where(qtiem => qtiem.AssistType == AssistTypeEnum.Teacher)?.FirstOrDefault();
string teacher = teacherManager?.AssistName ?? "暂无";
string orderStr = item.OrderCount > 0 ? "已报名" + item.OrderCount + "单" : "未报名";
string assistStr = "";
foreach (var subItem in item.AssistList)
{
if (subItem.AssistType != AssistTypeEnum.Teacher && subItem.AssistType != AssistTypeEnum.CourseAdviser)
{
assistStr += subItem.AssistType.ToName() + ":" + subItem.AssistName + ",";
}
}
var dataRow = new ExcelDataSource()
{
ExcelRows=new List<ExcelColumn>()
{
new ExcelColumn(item.StuName),
new ExcelColumn(course),
new ExcelColumn(teacher),
new ExcelColumn(orderStr),
new ExcelColumn(item.StuSex==0?"男":"女"),
new ExcelColumn(item.StuTel),
new ExcelColumn(item.QQ),
new ExcelColumn(item.WeChatNo),
new ExcelColumn(item.StuTypeName),
new ExcelColumn(item.StuStageName),
new ExcelColumn(item.StuNeedsName),
new ExcelColumn(item.StuProfession),
new ExcelColumn(item.StuEducation.ToName()),
new ExcelColumn(item.StuPurposeName),
new ExcelColumn(assistStr.TrimEnd(',')),
new ExcelColumn(item.CreateType.ToName()),
new ExcelColumn(item.StuSourceIdName),
new ExcelColumn(item.StuChannelName),
new ExcelColumn(item.VisitCount.ToString()),
new ExcelColumn(item.TrialLessonCount.ToString()),
new ExcelColumn(item.CreateTimeStr),
new ExcelColumn(item.CreateByName),
}
};
slist.Add(dataRow);
}
var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData, "application/octet-stream", excelName);
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 获取学生列表
/// </summary>
......
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