Skip to content

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

页面修改

parent e3f204b9
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 110 deletions
Edu.Model/ViewModel/DataStatistics/RB_Consultant_Data_Extend.cs
View file @ e87922cc
......@@ -10,5 +10,19 @@ namespace Edu.Model.ViewModel.DataStatistics
/// </summary>
public class RB_Consultant_Data_Extend: RB_Consultant_Data
{
/// <summary>
/// 开始时间
/// </summary>
public string StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public string EndTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public string QCreateByIds { get; set; }
}
}
Edu.Module.Customer/MarketConsultantModule.cs
View file @ e87922cc
......@@ -3,13 +3,11 @@ using Edu.Repository.Reserve;
using Edu.Repository.User;
using System;
using System.Collections.Generic;
using System.Text;
using System.Linq;
using Edu.Model.ViewModel.Customer;
using Edu.Repository.Sell;
using Edu.Model.ViewModel.Sell;
using Edu.Repository.DataStatistics;
using Edu.Model.CacheModel;
using Edu.Model.ViewModel.User;
using Edu.Model.ViewModel.DataStatistics;
using Edu.Model.ViewModel.Reserve;
......@@ -47,21 +45,27 @@ namespace Edu.Module.Customer
private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
/// <summary>
/// 市场部，课程顾问部数据统计仓储层对象
/// 员工资料管理仓储层对象
/// </summary>
private readonly RB_Market_DataRepository marketConsultantRepository = new RB_Market_DataRepository();
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 员工资料管理仓储层对象
/// 市场部数据统计仓储层对象
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
private readonly RB_Market_DataRepository market_DataRepository = new RB_Market_DataRepository();
/// <summary>
/// 课程顾问部数据统计仓储层对象
/// </summary>
private readonly RB_Consultant_DataRepository consultant_DataRepository = new RB_Consultant_DataRepository();
/// <summary>
/// 清除数据
/// </summary>
public void ClearData()
{
marketConsultantRepository.ClearMarketRepository();
market_DataRepository.ClearMarketRepository();
consultant_DataRepository.ClearConsultantRepository();
}
/// <summary>
......@@ -232,7 +236,7 @@ namespace Edu.Module.Customer
}
//5.销售额(签约量)
var orderList= orderRepository.GetMarketMarketConsultantStaticRepository(new RB_Order_ViewModel()
var orderList = orderRepository.GetMarketMarketConsultantStaticRepository(new RB_Order_ViewModel()
{
StartTime = start
});
......@@ -266,7 +270,7 @@ namespace Edu.Module.Customer
}
}
}
marketConsultantRepository.InsertMarketRepository(model);
market_DataRepository.InsertMarketRepository(model);
}
}
}
......@@ -291,45 +295,14 @@ namespace Edu.Module.Customer
{
foreach (var item in empList)
{
RB_Market_Data_Extend model = new RB_Market_Data_Extend()
RB_Consultant_Data_Extend model = new RB_Consultant_Data_Extend()
{
CreateBy = item.Id,
Group_Id = item.Group_Id,
Date = newTime,
DeptId = item.Dept_Id,
};
//1.条数(资源量)
var dicList = studentRepository.GetStudentClueRepository(new RB_Student_ViewModel() { StartTime = start });
if (dicList != null && dicList.Count > 0)
{
foreach (var sItem in dicList)
{
if (sItem.Key == "today")
{
model.ClueCount = sItem.Value?.Where(qitem => qitem.CreateBy == item.Id)?.FirstOrDefault()?.ClueCount ?? 0;
}
else if (sItem.Key == "yestoday")
{
model.YestodayClue = sItem.Value?.Where(qitem => qitem.CreateBy == item.Id)?.FirstOrDefault()?.ClueCount ?? 0;
}
else if (sItem.Key == "currentWeek")
{
model.CurWeekClue = sItem.Value?.Where(qitem => qitem.CreateBy == item.Id)?.FirstOrDefault()?.ClueCount ?? 0;
}
else if (sItem.Key == "lastWeek")
{
model.LastWeekClue = sItem.Value?.Where(qitem => qitem.CreateBy == item.Id)?.FirstOrDefault()?.ClueCount ?? 0;
}
else if (sItem.Key == "curMonth")
{
model.CurMonthClue = sItem.Value?.Where(qitem => qitem.CreateBy == item.Id)?.FirstOrDefault()?.ClueCount ?? 0;
}
else if (sItem.Key == "lastMonth")
{
model.LastMonthClue = sItem.Value?.Where(qitem => qitem.CreateBy == item.Id)?.FirstOrDefault()?.ClueCount ?? 0;
}
}
}
var followList = student_FollowRepository.GetStudentFollowStaticRepository(new RB_Student_Follow_Extend()
{
......@@ -444,37 +417,8 @@ namespace Edu.Module.Customer
{
StartTime = start
});
if (orderList != null && orderList.Count > 0)
{
foreach (var sItem in orderList)
{
if (sItem.Key == "today")
{
model.SaleMoney = sItem.Value?.Where(qitem => (qitem.EnterID == item.Id || qitem.CourseConsultantId == item.Id))?.Sum(qitem => qitem.Income) ?? 0;
}
else if (sItem.Key == "yestoday")
{
model.YestodaySale = sItem.Value?.Where(qitem => (qitem.EnterID == item.Id || qitem.CourseConsultantId == item.Id))?.Sum(qitem => qitem.Income) ?? 0;
}
else if (sItem.Key == "currentWeek")
{
model.CurWeekSale = sItem.Value?.Where(qitem => (qitem.EnterID == item.Id || qitem.CourseConsultantId == item.Id))?.Sum(qitem => qitem.Income) ?? 0;
}
else if (sItem.Key == "lastWeek")
{
model.LastWeekSale = sItem.Value?.Where(qitem => (qitem.EnterID == item.Id || qitem.CourseConsultantId == item.Id))?.Sum(qitem => qitem.Income) ?? 0;
}
else if (sItem.Key == "curMonth")
{
model.CurMonrhSale = sItem.Value?.Where(qitem => (qitem.EnterID == item.Id || qitem.CourseConsultantId == item.Id))?.Sum(qitem => qitem.Income) ?? 0;
}
else if (sItem.Key == "lastMonth")
{
model.LastMonthSale = sItem.Value?.Where(qitem => (qitem.EnterID == item.Id || qitem.CourseConsultantId == item.Id))?.Sum(qitem => qitem.Income) ?? 0;
}
}
}
marketConsultantRepository.InsertMarketRepository(model);
consultant_DataRepository.InsertConsultantRepository(model);
}
}
}
......@@ -489,14 +433,14 @@ namespace Edu.Module.Customer
DateTime start = Convert.ToDateTime(StartTime);
DateTime end = Convert.ToDateTime(EndTime);
var days = (end - start).Days;
var lastList= marketConsultantRepository.GetMarketListRepository(new RB_Market_Data_Extend()
var lastList = market_DataRepository.GetMarketListRepository(new RB_Market_Data_Extend()
{
StartTime=StartTime,
EndTime=EndTime,
QCreateByIds=EmpIds
StartTime = StartTime,
EndTime = EndTime,
QCreateByIds = EmpIds
});
//线索列表
var studentList =studentRepository.GetStudentStaticRepository(EmpIds, StartTime, EndTime);
var studentList = studentRepository.GetStudentStaticRepository(EmpIds, StartTime, EndTime);
//试听列表
var trialLessonList = visitor_ReserveRepository.GetVisitorReserveStaticRepository(new RB_Visitor_Reserve_Extend()
......@@ -549,7 +493,7 @@ namespace Edu.Module.Customer
{
DayStr = Common.ConvertHelper.FormatMonthDay(newDate),
//新增线索条数
ClueCount = tempLast?.Sum(qitem=>qitem.ClueCount)??0,
ClueCount = tempLast?.Sum(qitem => qitem.ClueCount) ?? 0,
//试听人数
TrialLessonCount = tempLast?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
//到访人数
......@@ -558,7 +502,7 @@ namespace Edu.Module.Customer
}
dayList.Add(tempObj);
}
var yesDataList= lastList?.Where(qitem => Common.ConvertHelper.FormatMonthDay(qitem.Date) == Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)))?.ToList();
var yesDataList = lastList?.Where(qitem => Common.ConvertHelper.FormatMonthDay(qitem.Date) == Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)))?.ToList();
obj = new
{
dayList,
......@@ -615,7 +559,7 @@ namespace Edu.Module.Customer
DateTime start = Convert.ToDateTime(StartTime);
DateTime end = Convert.ToDateTime(EndTime);
var days = (end - start).Days;
var lastList = marketConsultantRepository.GetMarketListRepository(new RB_Market_Data_Extend()
var lastList = consultant_DataRepository.GetConsultantListRepository(new RB_Consultant_Data_Extend()
{
StartTime = StartTime,
EndTime = EndTime,
......@@ -674,8 +618,7 @@ namespace Edu.Module.Customer
tempObj = new
{
DayStr = Common.ConvertHelper.FormatMonthDay(newDate),
//新增线索条数
ClueCount = tempLast?.Sum(qitem => qitem.ClueCount) ?? 0,
//试听人数
TrialLessonCount = tempLast?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
//到访人数
......@@ -692,12 +635,6 @@ namespace Edu.Module.Customer
{
DayStr = Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)),
ClueCount = yesDataList?.Sum(qitem => qitem.ClueCount) ?? 0,
YestodayClue = yesDataList?.Sum(qitem => qitem.YestodayClue) ?? 0,
CurWeekClue = yesDataList?.Sum(qitem => qitem.CurWeekClue) ?? 0,
LastWeekClue = yesDataList?.Sum(qitem => qitem.LastWeekClue) ?? 0,
CurMonthClue = yesDataList?.Sum(qitem => qitem.CurMonthClue) ?? 0,
LastMonthClue = yesDataList?.Sum(qitem => qitem.LastMonthClue) ?? 0,
FollowCount = yesDataList?.Sum(qitem => qitem.FollowCount) ?? 0,
YestodayFollow = yesDataList?.Sum(qitem => qitem.YestodayFollow) ?? 0,
......@@ -720,12 +657,7 @@ namespace Edu.Module.Customer
CurMonthTrialLesson = yesDataList?.Sum(qitem => qitem.CurMonthTrialLesson) ?? 0,
LastMonthTrialLesson = yesDataList?.Sum(qitem => qitem.LastMonthTrialLesson) ?? 0,
SaleMoney = yesDataList?.Sum(qitem => qitem.SaleMoney) ?? 0,
YestodaySale = yesDataList?.Sum(qitem => qitem.YestodaySale) ?? 0,
CurWeekSale = yesDataList?.Sum(qitem => qitem.CurWeekSale) ?? 0,
LastWeekSale = yesDataList?.Sum(qitem => qitem.LastWeekSale) ?? 0,
CurMonrhSale = yesDataList?.Sum(qitem => qitem.CurMonrhSale) ?? 0,
LastMonthSale = yesDataList?.Sum(qitem => qitem.LastMonthSale) ?? 0,
}
};
return obj;
......
Edu.Repository/DataStatistics/RB_Consultant_DataRepository.cs
View file @ e87922cc
......@@ -35,22 +35,22 @@ WHERE 1=1
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Consultant_Data_Extend.CreateBy), query.CreateBy);
}
//if (!string.IsNullOrEmpty(query.QCreateByIds))
//{
// builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Market_Data_Extend.CreateBy), query.QCreateByIds);
//}
if (!string.IsNullOrEmpty(query.QCreateByIds))
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Market_Data_Extend.CreateBy), query.QCreateByIds);
}
if (query.DeptId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Consultant_Data_Extend.DeptId), query.DeptId);
}
//if (!string.IsNullOrEmpty(query.StartTime))
//{
// builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Consultant_Data_Extend.Date), query.StartTime);
//}
//if (!string.IsNullOrEmpty(query.EndTime))
//{
// builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Market_Data_Extend.Date), query.EndTime);
//}
if (!string.IsNullOrEmpty(query.StartTime))
{
builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Consultant_Data_Extend.Date), query.StartTime);
}
if (!string.IsNullOrEmpty(query.EndTime))
{
builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Market_Data_Extend.Date), query.EndTime);
}
}
return Get<RB_Consultant_Data_Extend>(builder.ToString()).ToList();
}
......
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