Commit 1c68922e authored by 黄奎's avatar 黄奎

页面修改

parent a615ed38
using Edu.AOP.CustomerAttribute; using Edu.Common.Enum.User;
using Edu.Common.Enum;
using Edu.Common.Enum.System;
using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.CacheModel; using Edu.Model.CacheModel;
using Edu.Model.Entity.User; using Edu.Model.Entity.User;
using Edu.Model.ViewModel.Customer; using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.Mall;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Repository.Customer; using Edu.Repository.Customer;
using Edu.Repository.Mall;
using Edu.Repository.Reserve;
using Edu.Repository.System; using Edu.Repository.System;
using Edu.Repository.User; using Edu.Repository.User;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using VT.FW.DB;
namespace Edu.Module.User namespace Edu.Module.User
{ {
...@@ -78,7 +71,6 @@ namespace Edu.Module.User ...@@ -78,7 +71,6 @@ namespace Edu.Module.User
/// </summary> /// </summary>
private readonly RB_Student_MarketRepository student_MarketRepository = new RB_Student_MarketRepository(); private readonly RB_Student_MarketRepository student_MarketRepository = new RB_Student_MarketRepository();
#region 学员跟进 #region 学员跟进
/// <summary> /// <summary>
...@@ -384,7 +376,7 @@ namespace Edu.Module.User ...@@ -384,7 +376,7 @@ namespace Edu.Module.User
#endregion #endregion
#region 客户信息统计 #region 课程顾问部客户信息统计
/// <summary> /// <summary>
/// 客户数据每日统计 /// 客户数据每日统计
...@@ -413,7 +405,6 @@ namespace Edu.Module.User ...@@ -413,7 +405,6 @@ namespace Edu.Module.User
{ {
DateStr = "总数"; DateStr = "总数";
} }
if (index > 0) if (index > 0)
{ {
decimal PushCount = 0; decimal PushCount = 0;
...@@ -747,7 +738,7 @@ namespace Edu.Module.User ...@@ -747,7 +738,7 @@ namespace Edu.Module.User
var avgModel = new RB_Student_Static_Extend() var avgModel = new RB_Student_Static_Extend()
{ {
ShowMonthStr = "平均", 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), NewCount = Math.Round(monthList?.Average(qitem => qitem.NewCount) ?? 0, 2),
CommunicationCount = Math.Round(monthList?.Average(qitem => qitem.CommunicationCount) ?? 0, 2), CommunicationCount = Math.Round(monthList?.Average(qitem => qitem.CommunicationCount) ?? 0, 2),
TrialLessonCount = Math.Round(monthList?.Average(qitem => qitem.TrialLessonCount) ?? 0, 2), TrialLessonCount = Math.Round(monthList?.Average(qitem => qitem.TrialLessonCount) ?? 0, 2),
...@@ -872,7 +863,7 @@ namespace Edu.Module.User ...@@ -872,7 +863,7 @@ namespace Edu.Module.User
for (var i = 0; i < 12; i++) for (var i = 0; i < 12; i++)
{ {
decimal PushCount = 0; decimal PushCount = 0;
var firstModel =new RB_Student_Static_Extend(); var firstModel = new RB_Student_Static_Extend();
if (i > 0) if (i > 0)
{ {
firstModel = i < list.Count ? list[i - 1] : new RB_Student_Static_Extend(); firstModel = i < list.Count ? list[i - 1] : new RB_Student_Static_Extend();
...@@ -1035,7 +1026,7 @@ namespace Edu.Module.User ...@@ -1035,7 +1026,7 @@ namespace Edu.Module.User
} }
var newModel = new RB_Student_Static_Extend() var newModel = new RB_Student_Static_Extend()
{ {
MonthStr=i+1, MonthStr = i + 1,
PushCount = PushCount, PushCount = PushCount,
NewCount = NewCount, NewCount = NewCount,
CommunicationCount = CommunicationCount, CommunicationCount = CommunicationCount,
...@@ -1637,7 +1628,7 @@ namespace Edu.Module.User ...@@ -1637,7 +1628,7 @@ namespace Edu.Module.User
List<RateYearItem> yearList = new List<RateYearItem>(); List<RateYearItem> yearList = new List<RateYearItem>();
List<RB_Student_Static_Extend> rateList = new List<RB_Student_Static_Extend>(); List<RB_Student_Static_Extend> rateList = new List<RB_Student_Static_Extend>();
var list = student_StaticRepository.GetStudentStaticYearListRepository(query); 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 minYear = list.Min(qitem => qitem.YearStr);
int maxYear = list.Max(qitem => qitem.YearStr); int maxYear = list.Max(qitem => qitem.YearStr);
...@@ -2164,7 +2155,7 @@ namespace Edu.Module.User ...@@ -2164,7 +2155,7 @@ namespace Edu.Module.User
public List<RateYearItem> GetStudentStaticListYearRateModule(RB_Student_Static_Extend query) public List<RateYearItem> GetStudentStaticListYearRateModule(RB_Student_Static_Extend query)
{ {
List<RateYearItem> yearList = new List<RateYearItem>(); 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) if (dataList != null && dataList.Count > 0)
{ {
List<RB_Student_Static_Extend> result = new List<RB_Student_Static_Extend>(); List<RB_Student_Static_Extend> result = new List<RB_Student_Static_Extend>();
...@@ -2916,7 +2907,7 @@ namespace Edu.Module.User ...@@ -2916,7 +2907,7 @@ namespace Edu.Module.User
/// <param name="StartTime">开始时间</param> /// <param name="StartTime">开始时间</param>
/// <param name="EndTime">结束时间</param> /// <param name="EndTime">结束时间</param>
/// <returns></returns> /// <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; bool flag = true;
string empIds = ""; string empIds = "";
...@@ -3215,7 +3206,7 @@ namespace Edu.Module.User ...@@ -3215,7 +3206,7 @@ namespace Edu.Module.User
#endregion #endregion
#region #region 市场部客户数据统计
/// <summary> /// <summary>
/// 生成每天数据 /// 生成每天数据
/// </summary> /// </summary>
...@@ -3223,7 +3214,7 @@ namespace Edu.Module.User ...@@ -3223,7 +3214,7 @@ namespace Edu.Module.User
/// <param name="StartTime">开始时间</param> /// <param name="StartTime">开始时间</param>
/// <param name="EndTime">结束时间</param> /// <param name="EndTime">结束时间</param>
/// <returns></returns> /// <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; bool flag = true;
string empIds = ""; string empIds = "";
...@@ -3248,11 +3239,11 @@ namespace Edu.Module.User ...@@ -3248,11 +3239,11 @@ namespace Edu.Module.User
MeiTuanCount = procModel?.MeiTuanCount ?? 0, MeiTuanCount = procModel?.MeiTuanCount ?? 0,
EduCustomerSign = procModel?.EduCustomerSign ?? 0, EduCustomerSign = procModel?.EduCustomerSign ?? 0,
EduCustomerNotSign = procModel?.EduCustomerNotSign ?? 0, EduCustomerNotSign = procModel?.EduCustomerNotSign ?? 0,
PassBy= procModel?.PassBy ?? 0, PassBy = procModel?.PassBy ?? 0,
WeChatFriend= procModel?.WeChatFriend ?? 0, WeChatFriend = procModel?.WeChatFriend ?? 0,
TransCount = procModel?.TransCount ?? 0, TransCount = procModel?.TransCount ?? 0,
SchoolPromote= procModel?.SchoolPromote ?? 0, SchoolPromote = procModel?.SchoolPromote ?? 0,
SchoolAgent= procModel?.SchoolAgent ?? 0, SchoolAgent = procModel?.SchoolAgent ?? 0,
OfflineActivity = procModel?.OfflineActivity ?? 0, OfflineActivity = procModel?.OfflineActivity ?? 0,
OfficialAccount = procModel?.OfficialAccount ?? 0, OfficialAccount = procModel?.OfficialAccount ?? 0,
TeacherRecommend = procModel?.TeacherRecommend ?? 0, TeacherRecommend = procModel?.TeacherRecommend ?? 0,
...@@ -3517,7 +3508,7 @@ namespace Edu.Module.User ...@@ -3517,7 +3508,7 @@ namespace Edu.Module.User
{ {
DateStr = "总数"; DateStr = "总数";
} }
if (index > 0) if (index > 0)
{ {
decimal PushCount = 0; decimal PushCount = 0;
...@@ -3629,7 +3620,7 @@ namespace Edu.Module.User ...@@ -3629,7 +3620,7 @@ namespace Edu.Module.User
{ {
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100; ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100;
} }
decimal InvalidCount = 0; decimal InvalidCount = 0;
if (firstModel.InvalidCount > 0) if (firstModel.InvalidCount > 0)
{ {
...@@ -4020,7 +4011,7 @@ namespace Edu.Module.User ...@@ -4020,7 +4011,7 @@ namespace Edu.Module.User
{ {
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100; ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100;
} }
decimal InvalidCount = 0; decimal InvalidCount = 0;
if (firstModel.InvalidCount > 0 && i > 0) if (firstModel.InvalidCount > 0 && i > 0)
{ {
...@@ -4646,7 +4637,7 @@ namespace Edu.Module.User ...@@ -4646,7 +4637,7 @@ namespace Edu.Module.User
{ {
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100; ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / firstModel.ClassDCount * 100;
} }
decimal InvalidCount = 0; decimal InvalidCount = 0;
if (firstModel.InvalidCount > 0 && i > 0) if (firstModel.InvalidCount > 0 && i > 0)
{ {
...@@ -5561,11 +5552,9 @@ namespace Edu.Module.User ...@@ -5561,11 +5552,9 @@ namespace Edu.Module.User
SecondYear = Math.Round(curStudyOrderMoney, 2), SecondYear = Math.Round(curStudyOrderMoney, 2),
YearRate = Math.Round(CStudyOrderMoney, 2), YearRate = Math.Round(CStudyOrderMoney, 2),
}); });
} }
return yearList; return yearList;
} }
#endregion #endregion
} }
} }
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