Skip to content

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

页面修改

parent a615ed38
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 79 deletions
Edu.Module.User/StudentStatModule.cs
View file @ 1c68922e
using Edu.AOP.CustomerAttribute;
using Edu.Common.Enum;
using Edu.Common.Enum.System;
using Edu.Common.Enum.User;
using Edu.Common.Enum.User;
using Edu.Common.Plugin;
using Edu.Model.CacheModel;
using Edu.Model.Entity.User;
using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.Mall;
using Edu.Model.ViewModel.User;
using Edu.Repository.Customer;
using Edu.Repository.Mall;
using Edu.Repository.Reserve;
using Edu.Repository.System;
using Edu.Repository.User;
using System;
using System.Collections.Generic;
using System.Linq;
using VT.FW.DB;
namespace Edu.Module.User
{
......@@ -78,7 +71,6 @@ namespace Edu.Module.User
/// </summary>
private readonly RB_Student_MarketRepository student_MarketRepository = new RB_Student_MarketRepository();
#region 学员跟进
/// <summary>
......@@ -384,7 +376,7 @@ namespace Edu.Module.User
#endregion
#region 客户信息统计
#region 课程顾问部客户信息统计
/// <summary>
/// 客户数据每日统计
......@@ -413,7 +405,6 @@ namespace Edu.Module.User
{
DateStr = "总数";
}
if (index > 0)
{
decimal PushCount = 0;
......@@ -747,7 +738,7 @@ namespace Edu.Module.User
var avgModel = new RB_Student_Static_Extend()
{
ShowMonthStr = "平均",
PushCount =Math.Round( monthList?.Average(qitem=>qitem.PushCount)??0,2),
PushCount = Math.Round(monthList?.Average(qitem => qitem.PushCount) ?? 0, 2),
NewCount = Math.Round(monthList?.Average(qitem => qitem.NewCount) ?? 0, 2),
CommunicationCount = Math.Round(monthList?.Average(qitem => qitem.CommunicationCount) ?? 0, 2),
TrialLessonCount = Math.Round(monthList?.Average(qitem => qitem.TrialLessonCount) ?? 0, 2),
......@@ -872,7 +863,7 @@ namespace Edu.Module.User
for (var i = 0; i < 12; i++)
{
decimal PushCount = 0;
var firstModel =new RB_Student_Static_Extend();
var firstModel = new RB_Student_Static_Extend();
if (i > 0)
{
firstModel = i < list.Count ? list[i - 1] : new RB_Student_Static_Extend();
......@@ -1035,7 +1026,7 @@ namespace Edu.Module.User
}
var newModel = new RB_Student_Static_Extend()
{
MonthStr=i+1,
MonthStr = i + 1,
PushCount = PushCount,
NewCount = NewCount,
CommunicationCount = CommunicationCount,
......@@ -1637,7 +1628,7 @@ namespace Edu.Module.User
List<RateYearItem> yearList = new List<RateYearItem>();
List<RB_Student_Static_Extend> rateList = new List<RB_Student_Static_Extend>();
var list = student_StaticRepository.GetStudentStaticYearListRepository(query);
if (list != null && list.Count>0)
if (list != null && list.Count > 0)
{
int minYear = list.Min(qitem => qitem.YearStr);
int maxYear = list.Max(qitem => qitem.YearStr);
......@@ -2164,7 +2155,7 @@ namespace Edu.Module.User
public List<RateYearItem> GetStudentStaticListYearRateModule(RB_Student_Static_Extend query)
{
List<RateYearItem> yearList = new List<RateYearItem>();
var dataList = student_StaticRepository.GetStudentStaticMonthListRepository(query, isYear:true);
var dataList = student_StaticRepository.GetStudentStaticMonthListRepository(query, isYear: true);
if (dataList != null && dataList.Count > 0)
{
List<RB_Student_Static_Extend> result = new List<RB_Student_Static_Extend>();
......@@ -2916,7 +2907,7 @@ namespace Edu.Module.User
/// <param name="StartTime">开始时间</param>
/// <param name="EndTime">结束时间</param>
/// <returns></returns>
public bool CreateStudentStaticModule(UserInfo user, string StartTime, string EndTime,bool isInit=true)
public bool CreateStudentStaticModule(UserInfo user, string StartTime, string EndTime, bool isInit = true)
{
bool flag = true;
string empIds = "";
......@@ -3215,7 +3206,7 @@ namespace Edu.Module.User
#endregion
#region
#region 市场部客户数据统计
/// <summary>
/// 生成每天数据
/// </summary>
......@@ -3223,7 +3214,7 @@ namespace Edu.Module.User
/// <param name="StartTime">开始时间</param>
/// <param name="EndTime">结束时间</param>
/// <returns></returns>
public bool CreateStudentMarketModule(UserInfo user, string StartTime, string EndTime,bool isInit=true)
public bool CreateStudentMarketModule(UserInfo user, string StartTime, string EndTime, bool isInit = true)
{
bool flag = true;
string empIds = "";
......@@ -3248,11 +3239,11 @@ namespace Edu.Module.User
MeiTuanCount = procModel?.MeiTuanCount ?? 0,
EduCustomerSign = procModel?.EduCustomerSign ?? 0,
EduCustomerNotSign = procModel?.EduCustomerNotSign ?? 0,
PassBy= procModel?.PassBy ?? 0,
WeChatFriend= procModel?.WeChatFriend ?? 0,
PassBy = procModel?.PassBy ?? 0,
WeChatFriend = procModel?.WeChatFriend ?? 0,
TransCount = procModel?.TransCount ?? 0,
SchoolPromote= procModel?.SchoolPromote ?? 0,
SchoolAgent= procModel?.SchoolAgent ?? 0,
SchoolPromote = procModel?.SchoolPromote ?? 0,
SchoolAgent = procModel?.SchoolAgent ?? 0,
OfflineActivity = procModel?.OfflineActivity ?? 0,
OfficialAccount = procModel?.OfficialAccount ?? 0,
TeacherRecommend = procModel?.TeacherRecommend ?? 0,
......@@ -3517,7 +3508,7 @@ namespace Edu.Module.User
{
DateStr = "总数";
}
if (index > 0)
{
decimal PushCount = 0;
......@@ -3629,7 +3620,7 @@ namespace Edu.Module.User
{
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100;
}
decimal InvalidCount = 0;
if (firstModel.InvalidCount > 0)
{
......@@ -4020,7 +4011,7 @@ namespace Edu.Module.User
{
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100;
}
decimal InvalidCount = 0;
if (firstModel.InvalidCount > 0 && i > 0)
{
......@@ -4646,7 +4637,7 @@ namespace Edu.Module.User
{
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100;
}
decimal InvalidCount = 0;
if (firstModel.InvalidCount > 0 && i > 0)
{
......@@ -5561,11 +5552,9 @@ namespace Edu.Module.User
SecondYear = Math.Round(curStudyOrderMoney, 2),
YearRate = Math.Round(CStudyOrderMoney, 2),
});
}
return yearList;
}
#endregion
}
}
Edu.WebApi/Controllers/User/StudentStatController.cs
View file @ 1c68922e
......@@ -502,7 +502,7 @@ namespace Edu.WebApi.Controllers.User
#region 课程顾问部客户数据统计
/// <summary>
/// 客户数据每日统计
/// 课程顾问部客户数据每日统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -519,7 +519,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载客户数据每日统计
/// 下载课程顾问部客户数据每日统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -625,14 +625,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentStatic");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 客户数据月份统计
/// 课程顾问部客户数据每月统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -640,7 +640,7 @@ namespace Edu.WebApi.Controllers.User
{
var query = new RB_Student_Static_Extend()
{
YearStr = base.ParmJObj.GetInt("YearStr"),
YearStr = base.ParmJObj.GetInt("YearStr"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = studentStatModule.GetStudentStaticListMonthModule(query);
......@@ -648,7 +648,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载客户数据月份统计
/// 下载课程顾问部客户数据每月统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -753,14 +753,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentStaticMonth");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 客户数据月份成长率统计
/// 课程顾问部客户数据每月成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -776,7 +776,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载客户数据月份统计
/// 下载课程顾问部客户数据每月成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -820,19 +820,19 @@ namespace Edu.WebApi.Controllers.User
{
new ExcelColumn(item.ItemName)
};
columns.Add(new ExcelColumn(item.JanuaryRate+"%"));
columns.Add(new ExcelColumn(item.FebruaryRate+"%"));
columns.Add(new ExcelColumn(item.MarchRate+"%"));
columns.Add(new ExcelColumn(item.AprilRate+"%"));
columns.Add(new ExcelColumn(item.MayRate+"%"));
columns.Add(new ExcelColumn(item.JuneRate+"%"));
columns.Add(new ExcelColumn(item.JulyRate+"%"));
columns.Add(new ExcelColumn(item.AugustRate+"%"));
columns.Add(new ExcelColumn(item.SeptemberRate+"%"));
columns.Add(new ExcelColumn(item.OctoberRate+"%"));
columns.Add(new ExcelColumn(item.NovemberRate+"%"));
columns.Add(new ExcelColumn(item.DecemberRate+"%"));
columns.Add(new ExcelColumn(item.AvgRate+"%"));
columns.Add(new ExcelColumn(item.JanuaryRate + "%"));
columns.Add(new ExcelColumn(item.FebruaryRate + "%"));
columns.Add(new ExcelColumn(item.MarchRate + "%"));
columns.Add(new ExcelColumn(item.AprilRate + "%"));
columns.Add(new ExcelColumn(item.MayRate + "%"));
columns.Add(new ExcelColumn(item.JuneRate + "%"));
columns.Add(new ExcelColumn(item.JulyRate + "%"));
columns.Add(new ExcelColumn(item.AugustRate + "%"));
columns.Add(new ExcelColumn(item.SeptemberRate + "%"));
columns.Add(new ExcelColumn(item.OctoberRate + "%"));
columns.Add(new ExcelColumn(item.NovemberRate + "%"));
columns.Add(new ExcelColumn(item.DecemberRate + "%"));
columns.Add(new ExcelColumn(item.AvgRate + "%"));
var dataRow = new ExcelDataSource()
{
ExcelRows = columns
......@@ -844,14 +844,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentStaticMonthRate");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 客户数据年份统计
/// 课程顾问部客户数据年度统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -867,7 +867,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载客户数据年度统计
/// 下载课程顾问部客户数据年度统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -901,9 +901,9 @@ namespace Edu.WebApi.Controllers.User
{
new ExcelColumn(item.ItemName)
};
columns.Add(new ExcelColumn(item.FirstYear.ToString() ));
columns.Add(new ExcelColumn(item.FirstYear.ToString()));
columns.Add(new ExcelColumn(item.SecondYear.ToString()));
columns.Add(new ExcelColumn(item.YearRate+"%"));
columns.Add(new ExcelColumn(item.YearRate + "%"));
var dataRow = new ExcelDataSource()
{
ExcelRows = columns
......@@ -915,14 +915,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentStaticYear");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 客户数据年份统计
/// 课程顾问部客户数据年度成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -938,7 +938,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载客户数据年度成长率统计
/// 下载课程顾问部客户数据年度成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -986,14 +986,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentStaticYearRate");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 初始化学员统计数据
/// 初始化课程顾问部学员统计数据
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1051,7 +1051,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载市场部客户数据月份统计
/// 下载市场部客户数据每日统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1129,8 +1129,8 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassACount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassBCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassCCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("InvalidCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ClassDCount")));
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("StudyOrderMoney")));
......@@ -1145,14 +1145,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentMarket");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 市场部客户数据每日统计
/// 市场部客户数据月度统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1168,7 +1168,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载市场部客户数据每月统计
/// 下载市场部客户数据月度统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1261,14 +1261,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentMarketMonth");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 市场部客户数据月份统计
/// 市场部客户数据月度成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1284,7 +1284,7 @@ namespace Edu.WebApi.Controllers.User
}
/// <summary>
/// 下载市场部客户数据月份统计
/// 下载市场部客户数据月度成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1352,14 +1352,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentMarketMonthRate");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 市场部客户数据年份统计
/// 市场部客户数据年度统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1423,15 +1423,14 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentMarketYear");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
}
/// <summary>
/// 市场部客户数据年份统计
/// 市场部客户数据年度成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1446,9 +1445,8 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success(data: list);
}
/// <summary>
/// 下载客户数据年度成长率统计
/// 下载市场部客户数据年度成长率统计
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -1496,7 +1494,7 @@ namespace Edu.WebApi.Controllers.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "OutToExcelOrderStudentClassHoursList");
LogHelper.Write(ex, "DownLoadStudentMarketYearRate");
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", excelName);
}
......
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