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

feat:bug fixed

develop
old易 2023-10-19 10:01:22 +08:00
parent 5a7fe156d5
commit 6b507cf917
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -1054,7 +1054,7 @@ namespace New_College.Services
PlanIds.AddRange(newids); PlanIds.AddRange(newids);
} }
} }
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));
foreach (var item in info) foreach (var item in info)
{ {
if (!string.IsNullOrWhiteSpace(item.PlanMajorIds)) if (!string.IsNullOrWhiteSpace(item.PlanMajorIds))
@ -1069,11 +1069,11 @@ namespace New_College.Services
{ {
var newinfos = nowdesc.Select(x => new PlanInfo() var newinfos = nowdesc.Select(x => new PlanInfo()
{ {
Money = x.Tuitionfee, Money = x.Free,
Year = x.Studyyears == null ? "-" : x.Studyyears == "" ? "-" : x.Studyyears, Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(),
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);
@ -1091,12 +1091,11 @@ namespace New_College.Services
Infos = nowdesc.Select(x => new PlanInfo() Infos = nowdesc.Select(x => new PlanInfo()
{ {
Money = x.Tuitionfee, Money = x.Free,
Year = x.Studyyears == null ? "-" : x.Studyyears == "" ? "-" : x.Studyyears, Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(),
YearName = yearname, PlanName = x.Major,
PlanName = x.MajorName, PlanNum = x.PlanCount,
PlanNum = x.Plancount, Scoreline = x.LowScore
Scoreline = x.Scoreline
}).ToList() }).ToList()
}); });
} }
@ -1205,7 +1204,7 @@ namespace New_College.Services
//} //}
var descinfo = await _PlanMajorDescRepository.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(); 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");