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

bug fixed

develop
old易 2024-06-25 22:35:20 +08:00
parent 253ed19510
commit 8cda468805
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -597,7 +597,8 @@ namespace New_College.Services
List<PlanDescList> list = new List<PlanDescList>() { }; List<PlanDescList> list = new List<PlanDescList>() { };
foreach (var item in info.data) foreach (var item in info.data)
{ {
var newname = item.MajorName; string remark = !string.IsNullOrWhiteSpace(item.Remark) ? "(" + item.Remark + ")" : "";
var newname = item.MajorName + remark;
var newmoney = string.IsNullOrWhiteSpace(item.Fee) || item.Fee == "0" || item.Fee == "待定" ? "--" : item.Fee; var newmoney = string.IsNullOrWhiteSpace(item.Fee) || item.Fee == "0" || item.Fee == "待定" ? "--" : item.Fee;
//var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore); //var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore);
//if (count > 0) //if (count > 0)
@ -609,7 +610,7 @@ namespace New_College.Services
Money = newmoney, Money = newmoney,
PlanNum = item._plancount, PlanNum = item._plancount,
MajorId = item.ID, MajorId = item.ID,
Scoreline = item._Score, Scoreline = item._Score,
Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保 Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保
Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score), Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score),
Subject = item._23subject, Subject = item._23subject,
@ -1250,12 +1251,13 @@ namespace New_College.Services
var count = list.Where(x => x.UniversityName == item.UniversityName).ToList(); var count = list.Where(x => x.UniversityName == item.UniversityName).ToList();
if (count.Count > 0) if (count.Count > 0)
{ {
var newinfos = nowdesc.Select(x => new PlanInfo() var newinfos = nowdesc.Select(x => new PlanInfo()
{ {
MajorId = x.ID, MajorId = x.ID,
Money = x.Fee, Money = x.Fee,
Year = x.AcademicYear, Year = x.AcademicYear,
PlanName = x.MajorName, PlanName = x.MajorName + (!string.IsNullOrWhiteSpace(x.Remark) ? "(" + x.Remark + ")" : ""),
PlanNum = int.Parse(x._23Count), PlanNum = int.Parse(x._23Count),
Scoreline = x._23Score == "0" ? "-" : x._23Score, Scoreline = x._23Score == "0" ? "-" : x._23Score,
LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString() LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString()
@ -1282,7 +1284,7 @@ namespace New_College.Services
MajorId = x.ID, MajorId = x.ID,
Money = x.Fee, Money = x.Fee,
Year = x.AcademicYear, Year = x.AcademicYear,
PlanName = x.MajorName, PlanName = x.MajorName + (!string.IsNullOrWhiteSpace(x.Remark) ? "(" + x.Remark + ")" : ""),
PlanNum = int.Parse(x._23Count), PlanNum = int.Parse(x._23Count),
Scoreline = x._23Score == "0" ? "-" : x._23Score, Scoreline = x._23Score == "0" ? "-" : x._23Score,
LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString(), LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString(),