yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:bug fixed

develop
old易 2023-10-19 09:28:21 +08:00
parent be08c3017d
commit 5a7fe156d5
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -1195,16 +1195,19 @@ namespace New_College.Services
id = item.PlanMagorIds.First();
}
}
string yearName = string.Empty;
var plandescmodels = await this.t_EnrollmentPlanedesc.QueryById(id);
if (plandescmodels != null)
{
var planinfo = await this.t_EnrollmentPlaneRepository.QueryById(plandescmodels.PlanId);
if (planinfo != null)
yearName = planinfo.Years.ToString();
}
var descinfo = await _dal.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id));
//string yearName = string.Empty;
//var plandescmodels = await this._PlanMajorDescRepository.QueryById(id);
//if (plandescmodels != null)
//{
// var planinfo = await this.t_EnrollmentPlaneRepository.QueryById(plandescmodels.PlanId);
// if (planinfo != null)
// yearName = planinfo.Years.ToString();
//}
var descinfo = await _PlanMajorDescRepository.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id));
string yearName = (descinfo.FirstOrDefault().Years-1).ToString();
var universityids = query.details.Select(x => x.UniversityId).ToList();
var universityinfo = await d_UniversityRepository.Query(x => universityids.Contains(x.Id) && x.IsDelete == false, "Rank asc");
foreach (var item in query.details)
{
@ -1224,11 +1227,11 @@ namespace New_College.Services
var newinfos = nowdesc.Select(x => new PlanInfo()
{
MajorId = x.Id,
Money = x.Tuitionfee,
Year = x.Studyyears,
PlanName = x.MajorName,
PlanNum = x.Plancount,
Scoreline = x.Scoreline
Money = x.Free,
Year = x.AcademicYear,
PlanName = x.Major,
PlanNum = x.PlanCount,
Scoreline = x.LowScore
}).ToList();
count.FirstOrDefault().Infos.AddRange(newinfos);
}
@ -1248,11 +1251,11 @@ namespace New_College.Services
Infos = nowdesc.Select(x => new PlanInfo()
{
MajorId = x.Id,
Money = x.Tuitionfee,
Year = x.Studyyears,
PlanName = x.MajorName,
PlanNum = x.Plancount,
Scoreline = x.Scoreline,
Money = x.Free,
Year = x.AcademicYear,
PlanName = x.Major,
PlanNum = x.PlanCount,
Scoreline = x.LowScore,
YearName = yearName
}).ToList()
});