Skip to content

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

页面修改

parent 65630b00
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 44 deletions
Edu.Model/ViewModel/User/RB_Student_Company_Extend.cs
View file @ 79a8e1b4
...@@ -36,6 +36,11 @@ namespace Edu.Model.ViewModel.User ...@@ -36,6 +36,11 @@ namespace Edu.Model.ViewModel.User
/// 当月上课人数【當月份尚未結束銷課的總人數(包含當月新報名)】 /// 当月上课人数【當月份尚未結束銷課的總人數(包含當月新報名)】
/// </summary> /// </summary>
public decimal ClassStudentCount { get; set; } public decimal ClassStudentCount { get; set; }
/// <summary>
/// 查询编号
/// </summary>
public string QIds { get; set; }
} }
/// <summary> /// <summary>
......
Edu.Model/ViewModel/User/RB_Student_Static_Extend.cs
View file @ 79a8e1b4
...@@ -31,6 +31,11 @@ namespace Edu.Model.ViewModel.User ...@@ -31,6 +31,11 @@ namespace Edu.Model.ViewModel.User
/// 查询待收金额不为0的数据 /// 查询待收金额不为0的数据
/// </summary> /// </summary>
public int IsQueryNotMoney { get; set; } public int IsQueryNotMoney { get; set; }
/// <summary>
/// 查询编号
/// </summary>
public string QIds { get; set; }
} }
/// <summary> /// <summary>
......
Edu.Module.User/StudentStatModule.cs
View file @ 79a8e1b4
...@@ -664,9 +664,9 @@ namespace Edu.Module.User ...@@ -664,9 +664,9 @@ namespace Edu.Module.User
DateStr = "月总数", DateStr = "月总数",
PushCount = tempList?.Sum(qitem => qitem.PushCount), PushCount = tempList?.Sum(qitem => qitem.PushCount),
NewCount = tempList?.Sum(qitem => qitem.NewCount), NewCount = tempList?.Sum(qitem => qitem.NewCount),
CommunicationCount = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.CommunicationCount) : 0, CommunicationCount = tempList != null && tempList.Count > 0 ? tempList?.LastOrDefault()?.CommunicationCount : 0,
TrialLessonCount = tempList?.Sum(qitem => qitem.TrialLessonCount), TrialLessonCount = tempList?.Sum(qitem => qitem.TrialLessonCount),
NotContacted = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.NotContacted) : 0, NotContacted = tempList != null && tempList.Count > 0 ? tempList?.LastOrDefault()?.NotContacted : 0,
JPCount = tempList?.Sum(qitem => qitem.JPCount), JPCount = tempList?.Sum(qitem => qitem.JPCount),
KRCount = tempList?.Sum(qitem => qitem.KRCount), KRCount = tempList?.Sum(qitem => qitem.KRCount),
FRCount = tempList?.Sum(qitem => qitem.FRCount), FRCount = tempList?.Sum(qitem => qitem.FRCount),
...@@ -709,18 +709,28 @@ namespace Edu.Module.User ...@@ -709,18 +709,28 @@ namespace Edu.Module.User
{ {
List<object> dataList = new List<object>(); List<object> dataList = new List<object>();
var list = student_StaticRepository.GetStudentStaticMonthListRepository(query); var list = student_StaticRepository.GetStudentStaticMonthListRepository(query);
var tempList = new List<RB_Student_Static_Extend>();
if (list != null)
{
string ids = string.Join(",", list.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(ids))
{
tempList= student_StaticRepository.GetStudentStaticListRepository(new RB_Student_Static_Extend() { QIds = ids });
}
}
List<RB_Student_Static_Extend> monthList = new List<RB_Student_Static_Extend>(); List<RB_Student_Static_Extend> monthList = new List<RB_Student_Static_Extend>();
for (var i = 1; i <= 12; i++) for (var i = 1; i <= 12; i++)
{ {
var tempData = list?.Where(qitem => qitem.Date.Month == i)?.FirstOrDefault(); var tempData = list?.Where(qitem => qitem.Date.Month == i)?.FirstOrDefault();
var currentTempData = tempList?.Where(qitem => qitem.Date.Month == i)?.FirstOrDefault();
var newData = new RB_Student_Static_Extend() var newData = new RB_Student_Static_Extend()
{ {
ShowMonthStr = i + "月", ShowMonthStr = i + "月",
PushCount = tempData?.PushCount ?? 0, PushCount = tempData?.PushCount ?? 0,
NewCount = tempData?.NewCount ?? 0, NewCount = tempData?.NewCount ?? 0,
CommunicationCount = tempData?.CommunicationCount ?? 0, CommunicationCount = currentTempData?.CommunicationCount ?? 0,
TrialLessonCount = tempData?.TrialLessonCount ?? 0, TrialLessonCount = tempData?.TrialLessonCount ?? 0,
NotContacted = tempData?.NotContacted ?? 0, NotContacted = currentTempData?.NotContacted ?? 0,
JPCount = tempData?.JPCount ?? 0, JPCount = tempData?.JPCount ?? 0,
KRCount = tempData?.KRCount ?? 0, KRCount = tempData?.KRCount ?? 0,
FRCount = tempData?.FRCount ?? 0, FRCount = tempData?.FRCount ?? 0,
...@@ -882,16 +892,29 @@ namespace Edu.Module.User ...@@ -882,16 +892,29 @@ namespace Edu.Module.User
{ {
List<RateMonthItem> monthList = new List<RateMonthItem>(); List<RateMonthItem> monthList = new List<RateMonthItem>();
var list = student_StaticRepository.GetStudentStaticMonthListRepository(query); var list = student_StaticRepository.GetStudentStaticMonthListRepository(query);
var tempList = new List<RB_Student_Static_Extend>();
if (list != null)
{
string ids = string.Join(",", list.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(ids))
{
tempList = student_StaticRepository.GetStudentStaticListRepository(new RB_Student_Static_Extend() { QIds = ids });
}
}
List<RB_Student_Static_Extend> result = new List<RB_Student_Static_Extend>(); List<RB_Student_Static_Extend> result = new List<RB_Student_Static_Extend>();
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();
var secondModel = 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();
secondModel= i < tempList.Count ? tempList[i - 1] : new RB_Student_Static_Extend();
} }
var item = i < list.Count ? list[i] : new RB_Student_Static_Extend(); var item = i < list.Count ? list[i] : new RB_Student_Static_Extend();
var item2= i < tempList.Count ? tempList[i] : new RB_Student_Static_Extend();
if (firstModel.PushCount > 0 && i > 0) if (firstModel.PushCount > 0 && i > 0)
{ {
PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100; PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100;
...@@ -903,9 +926,9 @@ namespace Edu.Module.User ...@@ -903,9 +926,9 @@ namespace Edu.Module.User
} }
decimal CommunicationCount = 0; decimal CommunicationCount = 0;
if (firstModel.CommunicationCount > 0 && i > 0) if (secondModel.CommunicationCount > 0 && i > 0)
{ {
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / firstModel.CommunicationCount * 100; CommunicationCount = (item2.CommunicationCount - secondModel.CommunicationCount) / secondModel.CommunicationCount * 100;
} }
decimal TrialLessonCount = 0; decimal TrialLessonCount = 0;
if (firstModel.TrialLessonCount > 0 && i > 0) if (firstModel.TrialLessonCount > 0 && i > 0)
...@@ -913,9 +936,9 @@ namespace Edu.Module.User ...@@ -913,9 +936,9 @@ namespace Edu.Module.User
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100; TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100;
} }
decimal NotContacted = 0; decimal NotContacted = 0;
if (firstModel.NotContacted > 0 && i > 0) if (secondModel.NotContacted > 0 && i > 0)
{ {
NotContacted = (item.NotContacted - firstModel.NotContacted) / firstModel.NotContacted * 100; NotContacted = (item2.NotContacted - secondModel.NotContacted) / secondModel.NotContacted * 100;
} }
decimal JPCount = 0; decimal JPCount = 0;
if (firstModel.JPCount > 0 && i > 0) if (firstModel.JPCount > 0 && i > 0)
...@@ -1698,6 +1721,15 @@ namespace Edu.Module.User ...@@ -1698,6 +1721,15 @@ 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);
var tempList = new List<RB_Student_Static_Extend>();
if (list != null)
{
string ids = string.Join(",", list.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(ids))
{
tempList = student_StaticRepository.GetStudentStaticListRepository(new RB_Student_Static_Extend() { QIds = ids });
}
}
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);
...@@ -1707,11 +1739,14 @@ namespace Edu.Module.User ...@@ -1707,11 +1739,14 @@ namespace Edu.Module.User
{ {
decimal PushCount = 0; decimal PushCount = 0;
var firstModel = new RB_Student_Static_Extend(); var firstModel = new RB_Student_Static_Extend();
var secondModel = 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();
secondModel = i < tempList.Count ? tempList[i - 1] : new RB_Student_Static_Extend();
} }
var item = i < list.Count ? list[i] : new RB_Student_Static_Extend(); var item = i < list.Count ? list[i] : new RB_Student_Static_Extend();
var item2= i < tempList.Count ? tempList[i] : new RB_Student_Static_Extend();
if (firstModel.PushCount > 0 && i > 0) if (firstModel.PushCount > 0 && i > 0)
{ {
PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100; PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100;
...@@ -1723,9 +1758,9 @@ namespace Edu.Module.User ...@@ -1723,9 +1758,9 @@ namespace Edu.Module.User
} }
decimal CommunicationCount = 0; decimal CommunicationCount = 0;
if (firstModel.CommunicationCount > 0 && i > 0) if (secondModel.CommunicationCount > 0 && i > 0)
{ {
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / firstModel.CommunicationCount * 100; CommunicationCount = (item2.CommunicationCount - secondModel.CommunicationCount) / secondModel.CommunicationCount * 100;
} }
decimal TrialLessonCount = 0; decimal TrialLessonCount = 0;
if (firstModel.TrialLessonCount > 0 && i > 0) if (firstModel.TrialLessonCount > 0 && i > 0)
...@@ -1733,9 +1768,9 @@ namespace Edu.Module.User ...@@ -1733,9 +1768,9 @@ namespace Edu.Module.User
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100; TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100;
} }
decimal NotContacted = 0; decimal NotContacted = 0;
if (firstModel.NotContacted > 0 && i > 0) if (secondModel.NotContacted > 0 && i > 0)
{ {
NotContacted = (item.NotContacted - firstModel.NotContacted) / firstModel.NotContacted * 100; NotContacted = (item2.NotContacted - secondModel.NotContacted) / secondModel.NotContacted * 100;
} }
decimal JPCount = 0; decimal JPCount = 0;
if (firstModel.JPCount > 0 && i > 0) if (firstModel.JPCount > 0 && i > 0)
...@@ -1940,9 +1975,9 @@ namespace Edu.Module.User ...@@ -1940,9 +1975,9 @@ namespace Edu.Module.User
{ {
ItemName = "初步(二次)沟通", ItemName = "初步(二次)沟通",
FirstYearStr = minYear, FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).CommunicationCount, 2), FirstYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == minYear).CommunicationCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2), SecondYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2),
}); });
...@@ -1960,9 +1995,9 @@ namespace Edu.Module.User ...@@ -1960,9 +1995,9 @@ namespace Edu.Module.User
{ {
ItemName = "待联系", ItemName = "待联系",
FirstYearStr = minYear, FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).NotContacted, 2), FirstYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == minYear).NotContacted, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2), SecondYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2),
}); });
...@@ -2255,6 +2290,15 @@ namespace Edu.Module.User ...@@ -2255,6 +2290,15 @@ namespace Edu.Module.User
{ {
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);
var tempList = new List<RB_Student_Static_Extend>();
if (dataList != null)
{
string ids = string.Join(",", dataList.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(ids))
{
tempList = student_StaticRepository.GetStudentStaticListRepository(new RB_Student_Static_Extend() { QIds = ids });
}
}
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>();
...@@ -2264,15 +2308,19 @@ namespace Edu.Module.User ...@@ -2264,15 +2308,19 @@ namespace Edu.Module.User
for (var y = 0; y <= totalYear; y++) for (var y = 0; y <= totalYear; y++)
{ {
var list = dataList.Where(qitem => qitem.YearStr == minYear + y).ToList(); var list = dataList.Where(qitem => qitem.YearStr == minYear + y).ToList();
var list2 = tempList.Where(qitem => qitem.YearStr == minYear + y).ToList();
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();
var secondModel = 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();
secondModel = i < list2.Count ? list2[i - 1] : new RB_Student_Static_Extend();
} }
var item = i < list.Count ? list[i] : new RB_Student_Static_Extend(); var item = i < list.Count ? list[i] : new RB_Student_Static_Extend();
var item2= i < list2.Count ? list2[i] : new RB_Student_Static_Extend();
if (firstModel.PushCount > 0 && i > 0) if (firstModel.PushCount > 0 && i > 0)
{ {
PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100; PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100;
...@@ -2284,9 +2332,9 @@ namespace Edu.Module.User ...@@ -2284,9 +2332,9 @@ namespace Edu.Module.User
} }
decimal CommunicationCount = 0; decimal CommunicationCount = 0;
if (firstModel.CommunicationCount > 0 && i > 0) if (secondModel.CommunicationCount > 0 && i > 0)
{ {
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / firstModel.CommunicationCount * 100; CommunicationCount = (item2.CommunicationCount - secondModel.CommunicationCount) / secondModel.CommunicationCount * 100;
} }
decimal TrialLessonCount = 0; decimal TrialLessonCount = 0;
if (firstModel.TrialLessonCount > 0 && i > 0) if (firstModel.TrialLessonCount > 0 && i > 0)
...@@ -2294,9 +2342,9 @@ namespace Edu.Module.User ...@@ -2294,9 +2342,9 @@ namespace Edu.Module.User
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100; TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100;
} }
decimal NotContacted = 0; decimal NotContacted = 0;
if (firstModel.NotContacted > 0 && i > 0) if (secondModel.NotContacted > 0 && i > 0)
{ {
NotContacted = (item.NotContacted - firstModel.NotContacted) / firstModel.NotContacted * 100; NotContacted = (item2.NotContacted - secondModel.NotContacted) / secondModel.NotContacted * 100;
} }
decimal JPCount = 0; decimal JPCount = 0;
if (firstModel.JPCount > 0 && i > 0) if (firstModel.JPCount > 0 && i > 0)
...@@ -5898,6 +5946,7 @@ namespace Edu.Module.User ...@@ -5898,6 +5946,7 @@ namespace Edu.Module.User
{ {
List<object> dataList = new List<object>(); List<object> dataList = new List<object>();
var list = student_CompanyRepository.GetStudentCompanyListRepository(query); var list = student_CompanyRepository.GetStudentCompanyListRepository(query);
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
int index = 0; int index = 0;
...@@ -6176,9 +6225,9 @@ namespace Edu.Module.User ...@@ -6176,9 +6225,9 @@ namespace Edu.Module.User
DateStr = "月总数", DateStr = "月总数",
PushCount = tempList?.Sum(qitem => qitem.PushCount), PushCount = tempList?.Sum(qitem => qitem.PushCount),
NewCount = tempList?.Sum(qitem => qitem.NewCount), NewCount = tempList?.Sum(qitem => qitem.NewCount),
CommunicationCount = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.CommunicationCount) : 0, CommunicationCount = tempList != null && tempList.Count > 0 ? tempList?.LastOrDefault()?.CommunicationCount : 0,
TrialLessonCount = tempList?.Sum(qitem => qitem.TrialLessonCount), TrialLessonCount = tempList?.Sum(qitem => qitem.TrialLessonCount),
NotContacted = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.NotContacted) : 0, NotContacted = tempList != null && tempList.Count > 0 ? tempList?.LastOrDefault()?.NotContacted : 0,
JPCount = tempList?.Sum(qitem => qitem.JPCount), JPCount = tempList?.Sum(qitem => qitem.JPCount),
KRCount = tempList?.Sum(qitem => qitem.KRCount), KRCount = tempList?.Sum(qitem => qitem.KRCount),
FRCount = tempList?.Sum(qitem => qitem.FRCount), FRCount = tempList?.Sum(qitem => qitem.FRCount),
...@@ -6221,6 +6270,15 @@ namespace Edu.Module.User ...@@ -6221,6 +6270,15 @@ namespace Edu.Module.User
{ {
List<object> dataList = new List<object>(); List<object> dataList = new List<object>();
var list = student_CompanyRepository.GetStudentCompanyMonthListRepository(query); var list = student_CompanyRepository.GetStudentCompanyMonthListRepository(query);
var tempList = new List<RB_Student_Company_Extend>();
if (list != null && list.Count > 0)
{
string Ids = string.Join(",", list.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(Ids))
{
tempList = student_CompanyRepository.GetStudentCompanyListRepository(new RB_Student_Company_Extend() { QIds = Ids });
}
}
var studentList = student_CompanyRepository.GetMonthStudentListRepository(); var studentList = student_CompanyRepository.GetMonthStudentListRepository();
List<RB_Student_Company_Extend> monthList = new List<RB_Student_Company_Extend>(); List<RB_Student_Company_Extend> monthList = new List<RB_Student_Company_Extend>();
for (var i = 1; i <= 12; i++) for (var i = 1; i <= 12; i++)
...@@ -6231,14 +6289,15 @@ namespace Edu.Module.User ...@@ -6231,14 +6289,15 @@ namespace Edu.Module.User
{ {
tempStudent = studentList.Where(qitem => qitem.YearStr == query.YearStr && qitem.MonthStr <= i).LastOrDefault(); tempStudent = studentList.Where(qitem => qitem.YearStr == query.YearStr && qitem.MonthStr <= i).LastOrDefault();
} }
var secondTempData= tempList?.Where(qitem => qitem.YearStr == query.YearStr && qitem.MonthStr == i).LastOrDefault();
var newData = new RB_Student_Company_Extend() var newData = new RB_Student_Company_Extend()
{ {
ShowMonthStr = i + "月", ShowMonthStr = i + "月",
PushCount = tempData?.PushCount ?? 0, PushCount = tempData?.PushCount ?? 0,
NewCount = tempData?.NewCount ?? 0, NewCount = tempData?.NewCount ?? 0,
CommunicationCount = tempData?.CommunicationCount ?? 0, CommunicationCount = secondTempData?.CommunicationCount ?? 0,
TrialLessonCount = tempData?.TrialLessonCount ?? 0, TrialLessonCount = tempData?.TrialLessonCount ?? 0,
NotContacted = tempData?.NotContacted ?? 0, NotContacted = secondTempData?.NotContacted ?? 0,
JPCount = tempData?.JPCount ?? 0, JPCount = tempData?.JPCount ?? 0,
KRCount = tempData?.KRCount ?? 0, KRCount = tempData?.KRCount ?? 0,
FRCount = tempData?.FRCount ?? 0, FRCount = tempData?.FRCount ?? 0,
...@@ -6405,15 +6464,27 @@ namespace Edu.Module.User ...@@ -6405,15 +6464,27 @@ namespace Edu.Module.User
List<RateMonthItem> monthList = new List<RateMonthItem>(); List<RateMonthItem> monthList = new List<RateMonthItem>();
var list = student_CompanyRepository.GetStudentCompanyMonthListRepository(query); var list = student_CompanyRepository.GetStudentCompanyMonthListRepository(query);
List<RB_Student_Company_Extend> result = new List<RB_Student_Company_Extend>(); List<RB_Student_Company_Extend> result = new List<RB_Student_Company_Extend>();
var tempList = new List<RB_Student_Company_Extend>();
if (list != null && list.Count > 0)
{
string Ids = string.Join(",", list.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(Ids))
{
tempList = student_CompanyRepository.GetStudentCompanyListRepository(new RB_Student_Company_Extend() { QIds = Ids });
}
}
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_Company_Extend(); var firstModel = new RB_Student_Company_Extend();
var secondModel= new RB_Student_Company_Extend();
if (i > 0) if (i > 0)
{ {
firstModel = i < list.Count ? list[i - 1] : new RB_Student_Company_Extend(); firstModel = i < list.Count ? list[i - 1] : new RB_Student_Company_Extend();
secondModel = i < tempList.Count ? tempList[i - 1] : new RB_Student_Company_Extend();
} }
var item = i < list.Count ? list[i] : new RB_Student_Company_Extend(); var item = i < list.Count ? list[i] : new RB_Student_Company_Extend();
var item2 = i < tempList.Count ? tempList[i] : new RB_Student_Company_Extend();
if (firstModel.PushCount > 0 && i > 0) if (firstModel.PushCount > 0 && i > 0)
{ {
PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100; PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100;
...@@ -6425,9 +6496,9 @@ namespace Edu.Module.User ...@@ -6425,9 +6496,9 @@ namespace Edu.Module.User
} }
decimal CommunicationCount = 0; decimal CommunicationCount = 0;
if (firstModel.CommunicationCount > 0 && i > 0) if (secondModel.CommunicationCount > 0 && i > 0)
{ {
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / firstModel.CommunicationCount * 100; CommunicationCount = (item2.CommunicationCount - secondModel.CommunicationCount) / secondModel.CommunicationCount * 100;
} }
decimal TrialLessonCount = 0; decimal TrialLessonCount = 0;
if (firstModel.TrialLessonCount > 0 && i > 0) if (firstModel.TrialLessonCount > 0 && i > 0)
...@@ -6435,9 +6506,9 @@ namespace Edu.Module.User ...@@ -6435,9 +6506,9 @@ namespace Edu.Module.User
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100; TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100;
} }
decimal NotContacted = 0; decimal NotContacted = 0;
if (firstModel.NotContacted > 0 && i > 0) if (secondModel.NotContacted > 0 && i > 0)
{ {
NotContacted = (item.NotContacted - firstModel.NotContacted) / firstModel.NotContacted * 100; NotContacted = (item2.NotContacted - secondModel.NotContacted) / secondModel.NotContacted * 100;
} }
decimal JPCount = 0; decimal JPCount = 0;
if (firstModel.JPCount > 0 && i > 0) if (firstModel.JPCount > 0 && i > 0)
...@@ -7218,6 +7289,15 @@ namespace Edu.Module.User ...@@ -7218,6 +7289,15 @@ namespace Edu.Module.User
List<RateYearItem> yearList = new List<RateYearItem>(); List<RateYearItem> yearList = new List<RateYearItem>();
List<RB_Student_Company_Extend> rateList = new List<RB_Student_Company_Extend>(); List<RB_Student_Company_Extend> rateList = new List<RB_Student_Company_Extend>();
var list = student_CompanyRepository.GetStudentCompanyYearListRepository(query); var list = student_CompanyRepository.GetStudentCompanyYearListRepository(query);
var tempList = new List<RB_Student_Company_Extend>();
if (list != null && list.Count > 0)
{
string Ids = string.Join(",", list.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(Ids))
{
tempList = student_CompanyRepository.GetStudentCompanyListRepository(new RB_Student_Company_Extend() { QIds = Ids });
}
}
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);
...@@ -7227,11 +7307,14 @@ namespace Edu.Module.User ...@@ -7227,11 +7307,14 @@ namespace Edu.Module.User
{ {
decimal PushCount = 0; decimal PushCount = 0;
var firstModel = new RB_Student_Company_Extend(); var firstModel = new RB_Student_Company_Extend();
var secondModel=new RB_Student_Company_Extend();
if (i > 0) if (i > 0)
{ {
firstModel = i < list.Count ? list[i - 1] : new RB_Student_Company_Extend(); firstModel = i < list.Count ? list[i - 1] : new RB_Student_Company_Extend();
secondModel = i < tempList.Count ? tempList[i - 1] : new RB_Student_Company_Extend();
} }
var item = i < list.Count ? list[i] : new RB_Student_Company_Extend(); var item = i < list.Count ? list[i] : new RB_Student_Company_Extend();
var item2= i < tempList.Count ? tempList[i] : new RB_Student_Company_Extend();
if (firstModel.PushCount > 0 && i > 0) if (firstModel.PushCount > 0 && i > 0)
{ {
PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100; PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100;
...@@ -7243,9 +7326,9 @@ namespace Edu.Module.User ...@@ -7243,9 +7326,9 @@ namespace Edu.Module.User
} }
decimal CommunicationCount = 0; decimal CommunicationCount = 0;
if (firstModel.CommunicationCount > 0 && i > 0) if (secondModel.CommunicationCount > 0 && i > 0)
{ {
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / firstModel.CommunicationCount * 100; CommunicationCount = (item2.CommunicationCount - secondModel.CommunicationCount) / secondModel.CommunicationCount * 100;
} }
decimal TrialLessonCount = 0; decimal TrialLessonCount = 0;
if (firstModel.TrialLessonCount > 0 && i > 0) if (firstModel.TrialLessonCount > 0 && i > 0)
...@@ -7253,9 +7336,9 @@ namespace Edu.Module.User ...@@ -7253,9 +7336,9 @@ namespace Edu.Module.User
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100; TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100;
} }
decimal NotContacted = 0; decimal NotContacted = 0;
if (firstModel.NotContacted > 0 && i > 0) if (secondModel.NotContacted > 0 && i > 0)
{ {
NotContacted = (item.NotContacted - firstModel.NotContacted) / firstModel.NotContacted * 100; NotContacted = (item2.NotContacted - secondModel.NotContacted) / secondModel.NotContacted * 100;
} }
decimal JPCount = 0; decimal JPCount = 0;
if (firstModel.JPCount > 0 && i > 0) if (firstModel.JPCount > 0 && i > 0)
...@@ -7460,9 +7543,9 @@ namespace Edu.Module.User ...@@ -7460,9 +7543,9 @@ namespace Edu.Module.User
{ {
ItemName = "初步(二次)沟通", ItemName = "初步(二次)沟通",
FirstYearStr = minYear, FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).CommunicationCount, 2), FirstYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == minYear).CommunicationCount, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2), SecondYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2),
}); });
...@@ -7480,9 +7563,9 @@ namespace Edu.Module.User ...@@ -7480,9 +7563,9 @@ namespace Edu.Module.User
{ {
ItemName = "待联系", ItemName = "待联系",
FirstYearStr = minYear, FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).NotContacted, 2), FirstYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == minYear).NotContacted, 2),
SecondYearStr = maxYear, SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2), SecondYear = Math.Round(tempList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2), YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2),
}); });
...@@ -7776,6 +7859,15 @@ namespace Edu.Module.User ...@@ -7776,6 +7859,15 @@ namespace Edu.Module.User
{ {
List<RateYearItem> yearList = new List<RateYearItem>(); List<RateYearItem> yearList = new List<RateYearItem>();
var dataList = student_CompanyRepository.GetStudentCompanyMonthListRepository(query, isYear: true); var dataList = student_CompanyRepository.GetStudentCompanyMonthListRepository(query, isYear: true);
var tempList = new List<RB_Student_Company_Extend>();
if (dataList != null && dataList.Count > 0)
{
string Ids = string.Join(",", dataList.Select(qitem => qitem.Id));
if (!string.IsNullOrEmpty(Ids))
{
tempList = student_CompanyRepository.GetStudentCompanyListRepository(new RB_Student_Company_Extend() { QIds = Ids });
}
}
if (dataList != null && dataList.Count > 0) if (dataList != null && dataList.Count > 0)
{ {
List<RB_Student_Company_Extend> result = new List<RB_Student_Company_Extend>(); List<RB_Student_Company_Extend> result = new List<RB_Student_Company_Extend>();
...@@ -7785,15 +7877,19 @@ namespace Edu.Module.User ...@@ -7785,15 +7877,19 @@ namespace Edu.Module.User
for (var y = 0; y <= totalYear; y++) for (var y = 0; y <= totalYear; y++)
{ {
var list = dataList.Where(qitem => qitem.YearStr == minYear + y).ToList(); var list = dataList.Where(qitem => qitem.YearStr == minYear + y).ToList();
var list2 = dataList.Where(qitem => qitem.YearStr == minYear + y).ToList();
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_Company_Extend(); var firstModel = new RB_Student_Company_Extend();
var secondModel = new RB_Student_Company_Extend();
if (i > 0) if (i > 0)
{ {
firstModel = i < list.Count ? list[i - 1] : new RB_Student_Company_Extend(); firstModel = i < list.Count ? list[i - 1] : new RB_Student_Company_Extend();
secondModel = i < list2.Count ? list2[i - 1] : new RB_Student_Company_Extend();
} }
var item = i < list.Count ? list[i] : new RB_Student_Company_Extend(); var item = i < list.Count ? list[i] : new RB_Student_Company_Extend();
var item2 = i < list2.Count ? list2[i] : new RB_Student_Company_Extend();
if (firstModel.PushCount > 0 && i > 0) if (firstModel.PushCount > 0 && i > 0)
{ {
PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100; PushCount = (item.PushCount - firstModel.PushCount) / firstModel.PushCount * 100;
...@@ -7805,9 +7901,9 @@ namespace Edu.Module.User ...@@ -7805,9 +7901,9 @@ namespace Edu.Module.User
} }
decimal CommunicationCount = 0; decimal CommunicationCount = 0;
if (firstModel.CommunicationCount > 0 && i > 0) if (secondModel.CommunicationCount > 0 && i > 0)
{ {
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / firstModel.CommunicationCount * 100; CommunicationCount = (item2.CommunicationCount - secondModel.CommunicationCount) / secondModel.CommunicationCount * 100;
} }
decimal TrialLessonCount = 0; decimal TrialLessonCount = 0;
if (firstModel.TrialLessonCount > 0 && i > 0) if (firstModel.TrialLessonCount > 0 && i > 0)
...@@ -7815,9 +7911,9 @@ namespace Edu.Module.User ...@@ -7815,9 +7911,9 @@ namespace Edu.Module.User
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100; TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / firstModel.TrialLessonCount * 100;
} }
decimal NotContacted = 0; decimal NotContacted = 0;
if (firstModel.NotContacted > 0 && i > 0) if (secondModel.NotContacted > 0 && i > 0)
{ {
NotContacted = (item.NotContacted - firstModel.NotContacted) / firstModel.NotContacted * 100; NotContacted = (item2.NotContacted - secondModel.NotContacted) / secondModel.NotContacted * 100;
} }
decimal JPCount = 0; decimal JPCount = 0;
if (firstModel.JPCount > 0 && i > 0) if (firstModel.JPCount > 0 && i > 0)
......
Edu.Repository/User/RB_Student_CompanyRepository.cs
View file @ 79a8e1b4
...@@ -49,6 +49,10 @@ WHERE 1=1 ...@@ -49,6 +49,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND (A.{0}<>0 OR A.{1}<>0) ", nameof(RB_Student_Company_Extend.OrderNotMoney), nameof(RB_Student_Company_Extend.StudyOrderNotMoney)); builder.AppendFormat(" AND (A.{0}<>0 OR A.{1}<>0) ", nameof(RB_Student_Company_Extend.OrderNotMoney), nameof(RB_Student_Company_Extend.StudyOrderNotMoney));
} }
if (!string.IsNullOrEmpty(query.QIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_Company_Extend.Id), query.QIds);
}
} }
builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Student_Company_Extend.Id)); builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Student_Company_Extend.Id));
return Get<RB_Student_Company_Extend>(builder.ToString()).ToList(); return Get<RB_Student_Company_Extend>(builder.ToString()).ToList();
...@@ -63,7 +67,7 @@ WHERE 1=1 ...@@ -63,7 +67,7 @@ WHERE 1=1
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,MAX(A.CommunicationCount) AS CommunicationCount SELECT MAX(Id) AS Id,CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,MAX(A.CommunicationCount) AS CommunicationCount
,SUM(A.TrialLessonCount) AS TrialLessonCount,MAX(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount ,SUM(A.TrialLessonCount) AS TrialLessonCount,MAX(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount
,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount ,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount
,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount ,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount
...@@ -106,7 +110,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' ...@@ -106,7 +110,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,MAX(A.CommunicationCount) AS CommunicationCount SELECT MAX(Id) AS Id,CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,MAX(A.CommunicationCount) AS CommunicationCount
,SUM(A.TrialLessonCount) AS TrialLessonCount,MAX(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount ,SUM(A.TrialLessonCount) AS TrialLessonCount,MAX(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount
,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount ,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount
,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount ,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount
......
Edu.Repository/User/RB_Student_StaticRepository.cs
View file @ 79a8e1b4
...@@ -50,6 +50,10 @@ WHERE 1=1 ...@@ -50,6 +50,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND (A.{0}<>0 OR A.{1}<>0) ", nameof(RB_Student_Static_Extend.OrderNotMoney), nameof(RB_Student_Static_Extend.StudyOrderNotMoney)); builder.AppendFormat(" AND (A.{0}<>0 OR A.{1}<>0) ", nameof(RB_Student_Static_Extend.OrderNotMoney), nameof(RB_Student_Static_Extend.StudyOrderNotMoney));
} }
if (!string.IsNullOrWhiteSpace(query.QIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_Static_Extend.Id), query.QIds);
}
} }
builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Student_Static_Extend.Id)); builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Student_Static_Extend.Id));
return Get<RB_Student_Static_Extend>(builder.ToString()).ToList(); return Get<RB_Student_Static_Extend>(builder.ToString()).ToList();
...@@ -64,7 +68,7 @@ WHERE 1=1 ...@@ -64,7 +68,7 @@ WHERE 1=1
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,SUM(A.CommunicationCount) AS CommunicationCount SELECT MAX(Id) AS Id,CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,A.MonthStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,SUM(A.CommunicationCount) AS CommunicationCount
,SUM(A.TrialLessonCount) AS TrialLessonCount,SUM(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount ,SUM(A.TrialLessonCount) AS TrialLessonCount,SUM(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount
,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount ,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount
,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount ,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount
...@@ -107,7 +111,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' ...@@ -107,7 +111,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,SUM(A.CommunicationCount) AS CommunicationCount SELECT MAX(Id) AS Id,CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(A.PushCount) AS PushCount,SUM(A.NewCount) AS NewCount,SUM(A.CommunicationCount) AS CommunicationCount
,SUM(A.TrialLessonCount) AS TrialLessonCount,SUM(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount ,SUM(A.TrialLessonCount) AS TrialLessonCount,SUM(A.NotContacted) AS NotContacted,SUM(A.JPCount) AS JPCount,SUM(A.KRCount) AS KRCount,SUM(A.FRCount) AS FRCount
,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount ,SUM(A.JPStudyCount) AS JPStudyCount,SUM(A.KRStudyCount) AS KRStudyCount,SUM(A.YGAStudyCount) AS YGAStudyCount,SUM(A.USStudyCount) AS USStudyCount
,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount ,SUM(A.SGStudyCount) AS SGStudyCount,SUM(A.AXStudyCount) AS AXStudyCount,SUM(A.OtherCount) AS OtherCount,SUM(A.ClassACount) AS ClassACount,SUM(A.ClassBCount) AS ClassBCount
......
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