Skip to content

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

页面修改

parent 035f9290
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 76 deletions
Edu.Module.Customer/MarketConsultantModule.cs
View file @ c2e113d1
......@@ -785,7 +785,6 @@ namespace Edu.Module.Customer
public object ConsultantStaticModule(string EmpIds, string StartTime, string EndTime)
{
object obj = new object();
DateTime end = Convert.ToDateTime(EndTime);
string newStart = Common.ConvertHelper.FormatDate(end.AddMonths(-1));
if (string.IsNullOrEmpty(EmpIds))
......@@ -806,7 +805,7 @@ namespace Edu.Module.Customer
EndTime = EndTime,
QCreateBys = EmpIds,
}, isQueryAssist: true);
var lastList = consultant_DataRepository.GetConsultantListRepository(new RB_Consultant_Data_Extend()
var consultantDataList = consultant_DataRepository.GetConsultantListRepository(new RB_Consultant_Data_Extend()
{
StartTime = StartTime,
EndTime = EndTime,
......@@ -815,90 +814,109 @@ namespace Edu.Module.Customer
var curWeekStuList = studentList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.CreateTime) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)))?.ToList();
var curMonthStuList = studentList?.Where(qitem => qitem.CreateTime.Year == end.AddDays(-1).Year && qitem.CreateTime.Month == end.AddDays(-1).Month)?.ToList();
//效能目标
var consultantGoal = GetConsultantGoalListModule(new RB_Consultant_Goal_Extend() { Group_Id = 100000, Dept_Id = 13, YearStr = end.Year, MonthStr = end.Month })?.FirstOrDefault();
var yesDataList = lastList?.Where(qitem => qitem.Date.Year == end.AddDays(-1).Year && qitem.Date.Month == end.AddDays(-1).Month && qitem.Date.Day == end.AddDays(-1).Day)?.ToList();
//当前周
var curWeekList = lastList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)))?.ToList();
var curWeekList = consultantDataList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)))?.ToList();
//上一周
var lastWeekList = lastList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)) - 1)?.ToList();
var tempDataList = lastList?.Where(qitem => Common.ConvertHelper.FormatDate(qitem.Date) == Common.ConvertHelper.FormatDate(end.AddDays(-1)))?.ToList();
var lastWeekList = consultantDataList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)) - 1)?.ToList();
//前一天
var yesDataList = consultantDataList?.Where(qitem => Common.ConvertHelper.FormatDate(qitem.Date) == Common.ConvertHelper.FormatDate(end.AddDays(-1)))?.ToList();
var TrialLessonCount = yesDataList?.Sum(qitem => qitem.TrialLessonCount) ?? 0;
var YestodayTrialLesson = yesDataList?.Sum(qitem => qitem.YestodayTrialLesson) ?? 0;
var CurWeekTrialLesson = curWeekList?.Sum(qitem => qitem.CurWeekTrialLesson) ?? 0;
var LastWeekTrialLesson = lastWeekList?.Sum(qitem => qitem.LastWeekTrialLesson) ?? 0;
var CurMonthTrialLesson = tempDataList?.Sum(qitem => qitem.CurMonthTrialLesson) ?? 0;
var LastMonthTrialLesson = tempDataList?.Sum(qitem => qitem.LastMonthTrialLesson) ?? 0;
var CurWeekTrialLesson = curWeekList?.Sum(qitem => qitem.TrialLessonCount) ?? 0;
var LastWeekTrialLesson = lastWeekList?.Sum(qitem => qitem.YestodayTrialLesson) ?? 0;
var CurMonthTrialLesson = yesDataList?.Sum(qitem => qitem.CurMonthTrialLesson) ?? 0;
var LastMonthTrialLesson = yesDataList?.Sum(qitem => qitem.LastMonthTrialLesson) ?? 0;
var VisitCount = yesDataList?.Sum(qitem => qitem.VisitCount) ?? 0;
var YestodayVisit = yesDataList?.Sum(qitem => qitem.YestodayVisit) ?? 0;
var CurWeekVisit = curWeekList?.Sum(qitem => qitem.CurWeekVisit) ?? 0;
var LastWeekVisit = lastWeekList?.Sum(qitem => qitem.LastWeekVisit) ?? 0;
var CurMonthVisit = tempDataList?.Sum(qitem => qitem.CurMonthVisit) ?? 0;
var LastMonthVisit = tempDataList?.Sum(qitem => qitem.LastMonthVisit) ?? 0;
var CurWeekVisit = curWeekList?.Sum(qitem => qitem.VisitCount) ?? 0;
var LastWeekVisit = lastWeekList?.Sum(qitem => qitem.YestodayVisit) ?? 0;
var CurMonthVisit = yesDataList?.Sum(qitem => qitem.CurMonthVisit) ?? 0;
var LastMonthVisit = yesDataList?.Sum(qitem => qitem.LastMonthVisit) ?? 0;
var CurWeekOrderNum = yesDataList?.Sum(qitem => qitem.CurWeekOrderNum) ?? 0;
var LastWeekOrderNum = yesDataList?.Sum(qitem => qitem.LastWeekOrderNum) ?? 0;
var CurWeekOrderSale = yesDataList?.Sum(qitem => qitem.CurWeekOrderSale) ?? 0;
var LastWeekOrderSale = yesDataList?.Sum(qitem => qitem.LastWeekOrderSale) ?? 0;
var CurMonthOrderNum = yesDataList?.Sum(qitem => qitem.CurMonthOrderNum) ?? 0;
var LastMonthOrderNum = yesDataList?.Sum(qitem => qitem.LastMonthOrderNum) ?? 0;
var Rates = yesDataList?.Sum(qitem => qitem.Rates) ?? 0;
var YestodayRates = yesDataList?.Sum(qitem => qitem.YestodayRates) ?? 0;
var CurWeekRates = curWeekList?.Sum(qitem => qitem.CurWeekRates) ?? 0;
var LastWeekRates = lastWeekList?.Sum(qitem => qitem.LastWeekRates) ?? 0;
var CurMonthRates = tempDataList?.Sum(qitem => qitem.CurMonthRates) ?? 0;
var LastMonthRates = tempDataList?.Sum(qitem => qitem.LastMonthRates) ?? 0;
//本周转化率
decimal CurWeekRates = 0;
if (CurWeekOrderNum > 0)
{
CurWeekRates = Math.Round((Convert.ToDecimal(CurWeekVisit) / Convert.ToDecimal(CurWeekOrderNum) * Convert.ToDecimal(100)), 2);
}
//上周转化率
decimal LastWeekRates = 0;
if (LastWeekOrderNum > 0)
{
LastWeekRates =Math.Round((Convert.ToDecimal(LastWeekVisit) / Convert.ToDecimal(LastWeekOrderNum) * 100), 2);
}
//本月转化率
decimal CurMonthRates = 0;
if (CurMonthOrderNum > 0)
{
CurMonthRates = Math.Round((Convert.ToDecimal(CurMonthVisit) / Convert.ToDecimal(CurMonthOrderNum) * 100), 2);
}
//上月转化率
decimal LastMonthRates = 0;
if (LastMonthOrderNum > 0)
{
LastMonthRates= Math.Round((Convert.ToDecimal(LastMonthVisit) / Convert.ToDecimal(LastMonthOrderNum) * 100), 2);
}
var FollowCount = yesDataList?.Sum(qitem => qitem.FollowCount) ?? 0;
var YestodayFollow = yesDataList?.Sum(qitem => qitem.YestodayFollow) ?? 0;
var CurWeekFollow = curWeekList?.Sum(qitem => qitem.CurWeekFollow) ?? 0;
var LastWeekFollow = lastWeekList?.Sum(qitem => qitem.LastWeekFollow) ?? 0;
var CurMonthFollow = tempDataList?.Sum(qitem => qitem.CurMonthFollow) ?? 0;
var LastMonthFollow = tempDataList?.Sum(qitem => qitem.LastMonthFollow) ?? 0;
var CurWeekFollow = curWeekList?.Sum(qitem => qitem.FollowCount) ?? 0;
var LastWeekFollow = lastWeekList?.Sum(qitem => qitem.YestodayFollow) ?? 0;
var CurMonthFollow = yesDataList?.Sum(qitem => qitem.CurMonthFollow) ?? 0;
var LastMonthFollow = yesDataList?.Sum(qitem => qitem.LastMonthFollow) ?? 0;
decimal AgFollow = 0;
if (yesDataList != null && yesDataList.Where(qitem => qitem.AgFollow > 0).Count() > 0)
{
AgFollow = Math.Round(yesDataList?.Average(qitem => qitem.AgFollow) ?? 0, 2);
}
decimal YestodayAgFollow = 0;
if (yesDataList != null && yesDataList.Where(qitem => qitem.YestodayAgFollow > 0).Count() > 0)
{
YestodayAgFollow = Math.Round(yesDataList?.Average(qitem => qitem.YestodayAgFollow) ?? 0, 2);
}
decimal CurWeekAgFollow = 0;
if (curWeekList != null && curWeekList.Where(qitem => qitem.CurWeekAgFollow > 0).Count() > 0)
{
CurWeekAgFollow = Math.Round(curWeekList?.Average(qitem => qitem.CurWeekAgFollow) ?? 0, 2);
CurWeekAgFollow = Math.Round(yesDataList?.Average(qitem => qitem.CurWeekAgFollow) ?? 0, 2);
}
decimal LastWeekAgFollow = 0;
if (curWeekList != null && curWeekList.Where(qitem => qitem.LastWeekAgFollow > 0).Count() > 0)
if (curWeekList != null && yesDataList.Where(qitem => qitem.LastWeekAgFollow > 0).Count() > 0)
{
LastWeekAgFollow= Math.Round(lastWeekList?.Average(qitem => qitem.LastWeekAgFollow) ?? 0, 2);
LastWeekAgFollow= Math.Round(yesDataList?.Average(qitem => qitem.LastWeekAgFollow) ?? 0, 2);
}
decimal CurMonthAgFollow = 0;
decimal LastMonthAgFollow = 0;
if (tempDataList != null && tempDataList.Count > 0)
if (yesDataList != null && yesDataList.Count > 0)
{
CurMonthAgFollow = Math.Round(tempDataList?.Average(qitem => qitem.CurMonthAgFollow) ?? 0, 2);
LastMonthAgFollow = Math.Round(tempDataList?.Average(qitem => qitem.LastMonthAgFollow) ?? 0, 2);
CurMonthAgFollow = Math.Round(yesDataList?.Average(qitem => qitem.CurMonthAgFollow) ?? 0, 2);
LastMonthAgFollow = Math.Round(yesDataList?.Average(qitem => qitem.LastMonthAgFollow) ?? 0, 2);
}
var CurWeekOrderNum = curWeekList?.Sum(qitem => qitem.CurWeekOrderNum) ?? 0;
var LastWeekOrderNum = lastWeekList?.Sum(qitem => qitem.LastWeekOrderNum) ?? 0;
var CurWeekOrderSale = tempDataList?.Sum(qitem => qitem.CurWeekOrderSale) ?? 0;
var LastWeekOrderSale = tempDataList?.Sum(qitem => qitem.LastWeekOrderSale) ?? 0;
var CurMonthOrderSale = tempDataList?.Sum(qitem => qitem.CurMonthOrderSale) ?? 0;
var LastMonthOrderSale = tempDataList?.Sum(qitem => qitem.LastMonthOrderSale) ?? 0;
var CurMonthOrderSale = yesDataList?.Sum(qitem => qitem.CurMonthOrderSale) ?? 0;
var LastMonthOrderSale = yesDataList?.Sum(qitem => qitem.LastMonthOrderSale) ?? 0;
var CurMonthOrderGoal = consultantGoal?.GoalMoney ?? 0;
var CurMonthOrderNum = tempDataList?.Sum(qitem => qitem.CurMonthOrderNum) ?? 0;
var LastMonthOrderNum = tempDataList?.Sum(qitem => qitem.LastMonthOrderNum) ?? 0;
obj = new
{
DayStr = Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)),
......
Edu.Repository/Customer/RB_Student_FollowRepository.cs
View file @ c2e113d1
......@@ -209,11 +209,11 @@ WHERE A.Status=0 AND C.Status=0 AND C.StuStage<>7 {0}
string curWeek = "";
if (!string.IsNullOrEmpty(query.STime))
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d' )) = YEARWEEK('{0}') ", query.STime);
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1) ", query.STime);
}
else
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now()) ");
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) ");
}
var curWeekList = Get<RB_Student_Follow_Extend>(string.Format(sql, curWeek)).ToList();
dicList.Add("currentWeek", curWeekList);
......@@ -222,11 +222,11 @@ WHERE A.Status=0 AND C.Status=0 AND C.StuStage<>7 {0}
string lastWeek = "";
if (!string.IsNullOrEmpty(query.STime))
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK('{0}')-1 ", query.STime);
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1)-1 ", query.STime);
}
else
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now())-1 ");
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1 ");
}
var lastWeekList = Get<RB_Student_Follow_Extend>(string.Format(sql, lastWeek)).ToList();
dicList.Add("lastWeek", lastWeekList);
......@@ -308,11 +308,11 @@ WHERE A.Status=0 {0}
string curWeek = "";
if (!string.IsNullOrEmpty(query.STime))
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d' )) = YEARWEEK('{0}') ", query.STime);
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d' ),1) = YEARWEEK('{0}',1) ", query.STime);
}
else
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now()) ");
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) ");
}
var curWeekList = Get<RB_Student_Follow_Extend>(string.Format(sql, curWeek)).ToList();
dicList.Add("currentWeek", curWeekList);
......@@ -321,11 +321,11 @@ WHERE A.Status=0 {0}
string lastWeek = "";
if (!string.IsNullOrEmpty(query.STime))
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK('{0}')-1 ", query.STime);
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1)-1 ", query.STime);
}
else
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now())-1 ");
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1 ");
}
var lastWeekList = Get<RB_Student_Follow_Extend>(string.Format(sql, lastWeek)).ToList();
dicList.Add("lastWeek", lastWeekList);
......@@ -413,11 +413,11 @@ SELECT Avg(FollowCount) AS FollowEffectiveCount FROM
string curWeek = "";
if (!string.IsNullOrEmpty(query.STime))
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d' )) = YEARWEEK('{0}') ", query.STime);
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1) ", query.STime);
}
else
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now()) ");
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) ");
}
var curWeekList = Get<RB_Student_Follow_Extend>(string.Format(sql, curWeek)).ToList();
dicList.Add("currentWeek", curWeekList);
......@@ -426,11 +426,11 @@ SELECT Avg(FollowCount) AS FollowEffectiveCount FROM
string lastWeek = "";
if (!string.IsNullOrEmpty(query.STime))
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK('{0}')-1 ", query.STime);
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1)-1 ", query.STime);
}
else
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now())-1 ");
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1 ");
}
var lastWeekList = Get<RB_Student_Follow_Extend>(string.Format(sql, lastWeek)).ToList();
dicList.Add("lastWeek", lastWeekList);
......
Edu.Repository/Customer/RB_Student_VisitRepository.cs
View file @ c2e113d1
......@@ -239,11 +239,11 @@ WHERE 1=1 AND B.Status=0 {0}
string curWeek = "";
if (!string.IsNullOrEmpty(query.StartDate))
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d' )) = YEARWEEK('{0}') ", query.StartDate);
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1) ", query.StartDate);
}
else
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now()) ");
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) ");
}
var curWeekList = Get<RB_Student_Visit_Extend>(string.Format(sql, curWeek)).ToList();
dicList.Add("currentWeek", curWeekList);
......@@ -252,11 +252,11 @@ WHERE 1=1 AND B.Status=0 {0}
string lastWeek = "";
if (!string.IsNullOrEmpty(query.StartDate))
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK('{0}')-1 ", query.StartDate);
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1)-1 ", query.StartDate);
}
else
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now())-1 ");
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1 ");
}
var lastWeekList = Get<RB_Student_Visit_Extend>(string.Format(sql, lastWeek)).ToList();
dicList.Add("lastWeek", lastWeekList);
......
Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs
View file @ c2e113d1
......@@ -355,11 +355,11 @@ WHERE 1=1 AND A.Status=0 {0}
string curWeek = "";
if (!string.IsNullOrEmpty(query.StartClassDate))
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d' )) = YEARWEEK('{0}') ", query.StartClassDate);
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1) ", query.StartClassDate);
}
else
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now()) ");
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) ");
}
var curWeekList = Get<RB_Visitor_Reserve_Extend>(string.Format(sql, curWeek)).ToList();
dicList.Add("currentWeek", curWeekList);
......@@ -368,11 +368,11 @@ WHERE 1=1 AND A.Status=0 {0}
string lastWeek = "";
if (!string.IsNullOrEmpty(query.StartClassDate))
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK('{0}')-1 ", query.StartClassDate);
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1)-1 ", query.StartClassDate);
}
else
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now())-1 ");
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1 ");
}
var lastWeekList = Get<RB_Visitor_Reserve_Extend>(string.Format(sql, lastWeek)).ToList();
dicList.Add("lastWeek", lastWeekList);
......
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ c2e113d1
......@@ -1297,11 +1297,11 @@ WHERE 1=1 AND A.OrderState IN(1,2) {0}
string curWeek = "";
if (!string.IsNullOrEmpty(query.StartTime))
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d' )) = YEARWEEK('{0}') ", query.StartTime);
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1) ", query.StartTime);
}
else
{
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now()) ");
curWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) ");
}
var curWeekList = Get<RB_Order_ViewModel>(string.Format(sql, curWeek)).ToList();
dicList.Add("currentWeek", curWeekList);
......@@ -1310,11 +1310,11 @@ WHERE 1=1 AND A.OrderState IN(1,2) {0}
string lastWeek = "";
if (!string.IsNullOrEmpty(query.StartTime))
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK('{0}')-1 ", query.StartTime);
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1)-1 ", query.StartTime);
}
else
{
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d')) = YEARWEEK(now())-1 ");
lastWeek += string.Format(" AND YEARWEEK(date_format(A.CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1 ");
}
var lastWeekList = Get<RB_Order_ViewModel>(string.Format(sql, lastWeek)).ToList();
dicList.Add("lastWeek", lastWeekList);
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ c2e113d1
......@@ -866,7 +866,7 @@ GROUP BY A.StuStage ";
SELECT t.*,g.GroupName,s.SName
FROM rb_student AS t LEFT JOIN rb_group AS g ON t.Group_Id=g.GId
LEFT JOIN rb_school AS s ON t.School_Id=s.SId
WHERE 1=1 AND YEARWEEK(date_format(t.CreateTime, '%Y-%m-%d')) = YEARWEEK(now())
WHERE 1=1 AND YEARWEEK(date_format(t.CreateTime, '%Y-%m-%d'),1) = YEARWEEK(now(),1)
");
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
......@@ -1047,11 +1047,11 @@ WHERE 1=1
string curWeek = "";
if (!string.IsNullOrEmpty(query.StartTime))
{
curWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d' )) = YEARWEEK('{0}') ", query.StartTime);
curWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1) ", query.StartTime);
}
else
{
curWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d')) = YEARWEEK(now()) ");
curWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) ");
}
var curWeekList=Get<RB_Student_ViewModel>(string.Format(builder.ToString(), curWeek)).ToList();
dicList.Add("currentWeek", curWeekList);
......@@ -1060,11 +1060,11 @@ WHERE 1=1
string lastWeek = "";
if (!string.IsNullOrEmpty(query.StartTime))
{
lastWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d')) = YEARWEEK('{0}')-1 ", query.StartTime);
lastWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d'),1) = YEARWEEK('{0}',1)-1 ", query.StartTime);
}
else
{
lastWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d')) = YEARWEEK(now())-1 ");
lastWeek += string.Format(" AND YEARWEEK(date_format(CreateTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-1 ");
}
var lastWeekList = Get<RB_Student_ViewModel>(string.Format(builder.ToString(), lastWeek)).ToList();
dicList.Add("lastWeek", lastWeekList);
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ c2e113d1
......@@ -2672,8 +2672,8 @@ namespace Edu.WebApi.Controllers.User
ExcelDataSource subHeader = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() };
header.ExcelRows.Add(new ExcelColumn("员工") { Rowspan = 2, CellWidth = 15 });
subHeader.ExcelRows.Add(new ExcelColumn());
header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 25 });
subHeader.ExcelRows.Add(new ExcelColumn("本月"));
header.ExcelRows.Add(new ExcelColumn("本月名单") { CellWidth = 25, Rowspan = 2 });
subHeader.ExcelRows.Add(new ExcelColumn(""));
header.ExcelRows.Add(new ExcelColumn("试听") { CellWidth = 15, Colspan = 2 });
subHeader.ExcelRows.Add(new ExcelColumn("本周"));
......@@ -2715,8 +2715,8 @@ namespace Edu.WebApi.Controllers.User
excelRows.Add(new ExcelColumn(UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName));
string curWeekStu = string.Join(",", item?.CurWeekStuList?.Select(qitem => qitem.StuName));
string curMonthStu = string.Join(",", item?.CurMonthStuList?.Select(qitem => qitem.StuName));
excelRows.Add(new ExcelColumn(curWeekStu));
excelRows.Add(new ExcelColumn(curWeekStu));
excelRows.Add(new ExcelColumn(curMonthStu));
//excelRows.Add(new ExcelColumn(curWeekStu));
excelRows.Add(new ExcelColumn(item.CurWeekTrialLesson.ToString()));
excelRows.Add(new ExcelColumn(item.CurMonthTrialLesson.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