From 8cda468805b7cdc0314e7183e9fde775e9382200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Tue, 25 Jun 2024 22:35:20 +0800 Subject: [PATCH] bug fixed --- New_College.Services/T_EnrollmentPlanedescServices.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index 6a92efe..4240bee 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -597,7 +597,8 @@ namespace New_College.Services List list = new List() { }; 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 count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore); //if (count > 0) @@ -609,7 +610,7 @@ namespace New_College.Services Money = newmoney, PlanNum = item._plancount, MajorId = item.ID, - Scoreline = item._Score, + Scoreline = item._Score, Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保 Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score), Subject = item._23subject, @@ -1250,12 +1251,13 @@ namespace New_College.Services var count = list.Where(x => x.UniversityName == item.UniversityName).ToList(); if (count.Count > 0) { + var newinfos = nowdesc.Select(x => new PlanInfo() { MajorId = x.ID, Money = x.Fee, Year = x.AcademicYear, - PlanName = x.MajorName, + PlanName = x.MajorName + (!string.IsNullOrWhiteSpace(x.Remark) ? "(" + x.Remark + ")" : ""), PlanNum = int.Parse(x._23Count), Scoreline = x._23Score == "0" ? "-" : x._23Score, LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString() @@ -1282,7 +1284,7 @@ namespace New_College.Services MajorId = x.ID, Money = x.Fee, Year = x.AcademicYear, - PlanName = x.MajorName, + PlanName = x.MajorName + (!string.IsNullOrWhiteSpace(x.Remark) ? "(" + x.Remark + ")" : ""), PlanNum = int.Parse(x._23Count), Scoreline = x._23Score == "0" ? "-" : x._23Score, LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString(),