Skip to content

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

页面修改

parent b1d9e291
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
Edu.Module.User/StudentStatModule.cs
View file @ 2d160d14
......@@ -664,9 +664,9 @@ namespace Edu.Module.User
DateStr = "月总数",
PushCount = tempList?.Sum(qitem => qitem.PushCount),
NewCount = tempList?.Sum(qitem => qitem.NewCount),
CommunicationCount = tempList?.Sum(qitem => qitem.CommunicationCount),
CommunicationCount = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.CommunicationCount) : 0,
TrialLessonCount = tempList?.Sum(qitem => qitem.TrialLessonCount),
NotContacted = tempList?.Sum(qitem => qitem.NotContacted),
NotContacted = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.NotContacted) : 0,
JPCount = tempList?.Sum(qitem => qitem.JPCount),
KRCount = tempList?.Sum(qitem => qitem.KRCount),
FRCount = tempList?.Sum(qitem => qitem.FRCount),
......@@ -3139,9 +3139,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = lastMonthLastTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = lastMonthLastTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = lastMonthLastTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = lastMonthLastTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = lastMonthLastTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = lastMonthLastTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = lastMonthLastTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = lastMonthLastTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = lastMonthLastTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = lastMonthLastTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......@@ -3198,9 +3198,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = curMonthFirstTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthFirstTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthFirstTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = curMonthFirstTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = curMonthFirstTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthFirstTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = curMonthFirstTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = curMonthFirstTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthFirstTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthFirstTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......@@ -3257,9 +3257,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = curMonthSecondTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthSecondTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthSecondTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = curMonthSecondTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = curMonthSecondTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthSecondTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = curMonthSecondTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = curMonthSecondTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthSecondTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthSecondTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......@@ -3324,9 +3324,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = curMonthThirdTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthThirdTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthThirdTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = curMonthThirdTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = curMonthThirdTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthThirdTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = curMonthThirdTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = curMonthThirdTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthThirdTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthThirdTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......@@ -6176,9 +6176,9 @@ namespace Edu.Module.User
DateStr = "月总数",
PushCount = tempList?.Sum(qitem => qitem.PushCount),
NewCount = tempList?.Sum(qitem => qitem.NewCount),
CommunicationCount = tempList?.Sum(qitem => qitem.CommunicationCount),
TrialLessonCount = tempList?.Sum(qitem => qitem.TrialLessonCount),
NotContacted = tempList?.Sum(qitem => qitem.NotContacted),
CommunicationCount = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.CommunicationCount) : 0,
TrialLessonCount = tempList?.Sum(qitem => qitem.TrialLessonCount),
NotContacted = tempList != null && tempList.Count > 0 ? tempList?.Max(qitem => qitem.NotContacted) : 0,
JPCount = tempList?.Sum(qitem => qitem.JPCount),
KRCount = tempList?.Sum(qitem => qitem.KRCount),
FRCount = tempList?.Sum(qitem => qitem.FRCount),
......@@ -8661,9 +8661,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = lastMonthLastTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = lastMonthLastTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = lastMonthLastTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = lastMonthLastTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = lastMonthLastTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = lastMonthLastTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = lastMonthLastTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = lastMonthLastTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = lastMonthLastTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = lastMonthLastTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......@@ -8720,9 +8720,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = curMonthFirstTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthFirstTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthFirstTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = curMonthFirstTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = curMonthFirstTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthFirstTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = curMonthFirstTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = curMonthFirstTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthFirstTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthFirstTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......@@ -8779,9 +8779,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = curMonthSecondTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthSecondTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthSecondTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = curMonthSecondTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = curMonthSecondTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthSecondTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = curMonthSecondTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = curMonthSecondTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthSecondTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthSecondTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......@@ -8846,9 +8846,9 @@ namespace Edu.Module.User
Id = 0,
PushCount = curMonthThirdTimeList?.Sum(qitem => qitem.PushCount) ?? 0,
NewCount = curMonthThirdTimeList?.Sum(qitem => qitem.NewCount) ?? 0,
CommunicationCount = curMonthThirdTimeList?.Sum(qitem => qitem.CommunicationCount) ?? 0,
CommunicationCount = curMonthThirdTimeList?.LastOrDefault()?.CommunicationCount ?? 0,
TrialLessonCount = curMonthThirdTimeList?.Sum(qitem => qitem.TrialLessonCount) ?? 0,
NotContacted = curMonthThirdTimeList?.Sum(qitem => qitem.NotContacted) ?? 0,
NotContacted = curMonthThirdTimeList?.LastOrDefault()?.NotContacted ?? 0,
JPCount = curMonthThirdTimeList?.Sum(qitem => qitem.JPCount) ?? 0,
KRCount = curMonthThirdTimeList?.Sum(qitem => qitem.KRCount) ?? 0,
FRCount = curMonthThirdTimeList?.Sum(qitem => qitem.FRCount) ?? 0,
......
Edu.Repository/User/RB_Student_CompanyRepository.cs
View file @ 2d160d14
......@@ -63,8 +63,8 @@ WHERE 1=1
{
StringBuilder builder = new StringBuilder();
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
,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
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
,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.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.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount
......@@ -106,8 +106,8 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
{
StringBuilder builder = new StringBuilder();
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
,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
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
,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.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.ClassCCount) AS ClassCCount,SUM(A.ClassDCount) AS ClassDCount,SUM(A.CustomerCount) AS CustomerCount,SUM(A.B2CCount) AS B2CCount,SUM(A.TransCount) AS TransCount
......
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