Skip to content

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

页面修改

parent 4e8bfd2e
Show whitespace changes
Inline Side-by-side
Showing with 528 additions and 4 deletions
Edu.Model/ViewModel/User/RB_Student_Static_Extend.cs
View file @ 28f3c92f
......@@ -114,6 +114,16 @@ namespace Edu.Model.ViewModel.User
/// </summary>
public string ItemName { get; set; }
/// <summary>
/// 去年年份
/// </summary>
public int FirstYearStr { get; set; }
/// <summary>
/// 当前年份
/// </summary>
public int SecondYearStr { get; set; }
/// <summary>
/// 第一年
/// </summary>
......
Edu.Module.User/StudentStatModule.cs
View file @ 28f3c92f
......@@ -1622,11 +1622,525 @@ namespace Edu.Module.User
public List<RateYearItem> GetStudentStaticListYearModule(RB_Student_Static_Extend query)
{
List<RateYearItem> yearList = new List<RateYearItem>();
List<RB_Student_Static_Extend> rateList = new List<RB_Student_Static_Extend>();
var list = student_StaticRepository.GetStudentStaticYearListRepository(query);
if (list != null)
{
//int minYear=list.Min
int minYear = list.Min(qitem => qitem.YearStr);
int maxYear = list.Max(qitem => qitem.YearStr);
var totalYear = maxYear - minYear;
for (var i = 0; i <= totalYear; i++)
{
decimal PushCount = 0;
var firstModel = new RB_Student_Static_Extend();
if (i > 0)
{
firstModel = i < list.Count ? list[i - 1] : new RB_Student_Static_Extend();
}
var item = i < list.Count ? list[i] : new RB_Student_Static_Extend();
if (item.PushCount > 0 && i > 0)
{
PushCount = (item.PushCount - firstModel.PushCount) / item.PushCount * 100;
}
decimal NewCount = 0;
if (item.NewCount > 0 && i > 0)
{
NewCount = (item.NewCount - firstModel.NewCount) / item.NewCount * 100;
}
decimal CommunicationCount = 0;
if (item.CommunicationCount > 0 && i > 0)
{
CommunicationCount = (item.CommunicationCount - firstModel.CommunicationCount) / item.CommunicationCount * 100;
}
decimal TrialLessonCount = 0;
if (item.TrialLessonCount > 0 && i > 0)
{
TrialLessonCount = (item.TrialLessonCount - firstModel.TrialLessonCount) / item.TrialLessonCount * 100;
}
decimal NotContacted = 0;
if (item.NotContacted > 0 && i > 0)
{
NotContacted = (item.NotContacted - firstModel.NotContacted) / item.NotContacted * 100;
}
decimal JPCount = 0;
if (item.JPCount > 0 && i > 0)
{
JPCount = (item.JPCount - firstModel.JPCount) / item.JPCount * 100;
}
decimal KRCount = 0;
if (item.KRCount > 0 && i > 0)
{
KRCount = (item.KRCount - firstModel.KRCount) / item.KRCount * 100;
}
decimal FRCount = 0;
if (item.FRCount > 0 && i > 0)
{
FRCount = (item.FRCount - firstModel.FRCount) / item.FRCount * 100;
}
decimal JPStudyCount = 0;
if (item.JPStudyCount > 0 && i > 0)
{
JPStudyCount = (item.JPStudyCount - firstModel.JPStudyCount) / item.JPStudyCount * 100;
}
decimal KRStudyCount = 0;
if (item.KRStudyCount > 0 && i > 0)
{
KRStudyCount = (item.KRStudyCount - firstModel.KRStudyCount) / item.KRStudyCount * 100;
}
decimal YGAStudyCount = 0;
if (item.YGAStudyCount > 0 && i > 0)
{
YGAStudyCount = (item.YGAStudyCount - firstModel.YGAStudyCount) / item.YGAStudyCount * 100;
}
decimal USStudyCount = 0;
if (item.USStudyCount > 0 && i > 0)
{
USStudyCount = (item.USStudyCount - firstModel.USStudyCount) / item.USStudyCount * 100;
}
decimal SGStudyCount = 0;
if (item.SGStudyCount > 0 && i > 0)
{
SGStudyCount = (item.SGStudyCount - firstModel.SGStudyCount) / item.SGStudyCount * 100;
}
decimal AXStudyCount = 0;
if (item.AXStudyCount > 0 && i > 0)
{
AXStudyCount = (item.AXStudyCount - firstModel.AXStudyCount) / item.AXStudyCount * 100;
}
decimal OtherCount = 0;
if (item.OtherCount > 0 && i > 0)
{
OtherCount = (item.OtherCount - firstModel.OtherCount) / item.OtherCount * 100;
}
decimal ClassACount = 0;
if (item.ClassACount > 0 && i > 0)
{
ClassACount = (item.ClassACount - firstModel.ClassACount) / item.ClassACount * 100;
}
decimal ClassBCount = 0;
if (item.ClassBCount > 0 && i > 0)
{
ClassBCount = (item.ClassBCount - firstModel.ClassBCount) / item.ClassBCount * 100;
}
decimal ClassCCount = 0;
if (item.ClassCCount > 0)
{
ClassCCount = (item.ClassCCount - firstModel.ClassCCount) / item.ClassCCount * 100;
}
decimal ClassDCount = 0;
if (item.ClassDCount > 0 && i > 0)
{
ClassDCount = (item.ClassDCount - firstModel.ClassDCount) / item.ClassDCount * 100;
}
decimal CustomerCount = 0;
if (item.CustomerCount > 0 && i > 0)
{
CustomerCount = (item.CustomerCount - firstModel.CustomerCount) / item.CustomerCount * 100;
}
decimal B2CCount = 0;
if (item.B2CCount > 0 && i > 0)
{
B2CCount = (item.B2CCount - firstModel.B2CCount) / item.B2CCount * 100;
}
decimal TransCount = 0;
if (item.TransCount > 0 && i > 0)
{
TransCount = (item.TransCount - firstModel.TransCount) / item.TransCount * 100;
}
decimal InnerCount = 0;
if (item.InnerCount > 0 && i > 0)
{
InnerCount = (item.InnerCount - firstModel.InnerCount) / item.InnerCount * 100;
}
decimal InvalidCount = 0;
if (item.InvalidCount > 0 && i > 0)
{
InvalidCount = (item.InvalidCount - firstModel.InvalidCount) / item.InvalidCount * 100;
}
decimal SuspectedCount = 0;
if (item.SuspectedCount > 0 && i > 0)
{
SuspectedCount = (item.SuspectedCount - firstModel.SuspectedCount) / item.SuspectedCount * 100;
}
decimal IntentionCount = 0;
if (item.IntentionCount > 0 && i > 0)
{
IntentionCount = (item.IntentionCount - firstModel.IntentionCount) / item.IntentionCount * 100;
}
decimal InvitationCount = 0;
if (item.InvitationCount > 0 && i > 0)
{
InvitationCount = (item.InvitationCount - firstModel.InvitationCount) / item.InvitationCount * 100;
}
decimal NegotiationCount = 0;
if (item.NegotiationCount > 0 && i > 0)
{
NegotiationCount = (item.NegotiationCount - firstModel.NegotiationCount) / item.NegotiationCount * 100;
}
decimal ContractCount = 0;
if (item.ContractCount > 0 && i > 0)
{
ContractCount = (item.ContractCount - firstModel.ContractCount) / item.ContractCount * 100;
}
decimal OrderMoney = 0;
if (item.OrderMoney > 0 && i > 0)
{
OrderMoney = (item.OrderMoney - firstModel.OrderMoney) / item.OrderMoney * 100;
}
decimal StudyOrderMoney = 0;
if (item.StudyOrderMoney > 0 && i > 0)
{
StudyOrderMoney = (item.StudyOrderMoney - firstModel.StudyOrderMoney) / item.StudyOrderMoney * 100;
}
rateList.Add(new RB_Student_Static_Extend()
{
YearStr = minYear + i,
PushCount = PushCount,
NewCount = NewCount,
CommunicationCount = CommunicationCount,
TrialLessonCount = TrialLessonCount,
NotContacted = NotContacted,
JPCount = JPCount,
KRCount = KRCount,
FRCount = FRCount,
JPStudyCount = JPStudyCount,
KRStudyCount = KRStudyCount,
YGAStudyCount = YGAStudyCount,
USStudyCount = USStudyCount,
SGStudyCount = SGStudyCount,
AXStudyCount = AXStudyCount,
OtherCount = OtherCount,
ClassACount = ClassACount,
ClassBCount = ClassBCount,
ClassCCount = ClassCCount,
ClassDCount = ClassDCount,
CustomerCount = CustomerCount,
B2CCount = B2CCount,
TransCount = TransCount,
InnerCount = InnerCount,
InvalidCount = InvalidCount,
SuspectedCount = SuspectedCount,
IntentionCount = IntentionCount,
InvitationCount = InvitationCount,
NegotiationCount = NegotiationCount,
ContractCount = ContractCount,
OrderMoney = OrderMoney,
StudyOrderMoney = StudyOrderMoney,
});
}
yearList.Add(new RateYearItem()
{
ItemName = "推送人数",
FirstYearStr= minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).PushCount, 2),
SecondYearStr=maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).PushCount, 2),
YearRate= Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).PushCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "新客户",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).NewCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).NewCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NewCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "初步(二次)沟通",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).CommunicationCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CommunicationCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "预约试听(已到店.已试听)",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).TrialLessonCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).TrialLessonCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).TrialLessonCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "待联系",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).NotContacted, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NotContacted, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "日本语培",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).JPCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "韩国语培",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).KRCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "法国语培",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).FRCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).FRCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).FRCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "日本留学",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).JPStudyCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).JPStudyCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "韩国留学",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).KRStudyCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).KRStudyCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "英港澳留学",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).YGAStudyCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).YGAStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).YGAStudyCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "美国留学",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).USStudyCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).USStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).USStudyCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "新加坡留学",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).SGStudyCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).SGStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).SGStudyCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "澳新留学",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).AXStudyCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).AXStudyCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).AXStudyCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "其他",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).OtherCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OtherCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OtherCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "A类客户",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassACount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassACount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassACount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "B类客户",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassBCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassBCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassBCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "C类客户",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassCCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassCCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassCCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "D类客户",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).ClassDCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassDCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ClassDCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "同行介绍",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).CustomerCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).CustomerCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).CustomerCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "直客",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).B2CCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).B2CCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).B2CCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "学员转介绍",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).TransCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).TransCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).TransCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "内部介绍",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).InnerCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).InnerCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InnerCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "无效",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).InvalidCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvalidCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvalidCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "疑似",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).SuspectedCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).SuspectedCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).SuspectedCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "意向",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).IntentionCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).IntentionCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).IntentionCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "近期课邀约",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).InvitationCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvitationCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).InvitationCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "谈判",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).NegotiationCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).NegotiationCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).NegotiationCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "签约.成交.续费",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).ContractCount, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).ContractCount, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).ContractCount, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "语培签约金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).OrderMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).OrderMoney, 2),
});
yearList.Add(new RateYearItem()
{
ItemName = "留学签约金额",
FirstYearStr = minYear,
FirstYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == minYear).StudyOrderMoney, 2),
SecondYearStr = maxYear,
SecondYear = Math.Round(list.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
YearRate = Math.Round(rateList.FirstOrDefault(qitem => qitem.YearStr == maxYear).StudyOrderMoney, 2),
});
}
return yearList;
}
......
Edu.Repository/User/RB_Student_StaticRepository.cs
View file @ 28f3c92f
......@@ -115,7 +115,7 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
}
if (query.YearStr > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Static_Extend.YearStr), query.YearStr);
builder.AppendFormat(" AND A.{0}<={1} ", nameof(RB_Student_Static_Extend.YearStr), query.YearStr);
}
}
builder.AppendFormat(" GROUP BY A.YearStr ");
......
Edu.WebApi/Controllers/User/StudentStatController.cs
View file @ 28f3c92f
......@@ -561,7 +561,7 @@ namespace Edu.WebApi.Controllers.User
{
var query = new RB_Student_Static_Extend()
{
// YearStr = base.ParmJObj.GetInt("YearStr"),
YearStr = base.ParmJObj.GetInt("YearStr"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = studentStatModule.GetStudentStaticListYearModule(query);
......
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