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

43
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

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