From 253ed1951032ca7dc93deeeea47f8fb447fa226f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Tue, 25 Jun 2024 22:20:47 +0800 Subject: [PATCH] bug fixed --- New_College.Model/ViewModels/Result/VolunteerResult.cs | 2 +- New_College.Services/T_EnrollmentPlanedescServices.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/New_College.Model/ViewModels/Result/VolunteerResult.cs b/New_College.Model/ViewModels/Result/VolunteerResult.cs index bbbf64d..8d01d7e 100644 --- a/New_College.Model/ViewModels/Result/VolunteerResult.cs +++ b/New_College.Model/ViewModels/Result/VolunteerResult.cs @@ -162,7 +162,7 @@ namespace New_College.Model.ViewModels public string Year { get; set; } public string Money { get; set; } public long MajorId { get; set; } - public float Scoreline { get; set; } + public string Scoreline { get; set; } public string AcademicYear { get; set; } /// diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index e6be941..6a92efe 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -609,7 +609,7 @@ namespace New_College.Services Money = newmoney, PlanNum = item._plancount, MajorId = item.ID, - Scoreline = int.Parse(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, @@ -617,7 +617,7 @@ namespace New_College.Services planItems = new List() { new PlanItem() { - PlanCount=item._plancount.ToString(), + PlanCount=item._plancount.ToString(), RankLine="--", Scoreline="--", Year="2024" @@ -625,7 +625,7 @@ namespace New_College.Services new PlanItem() { PlanCount=item._23Count, - RankLine=item._23ScoreLine.ToString(), + RankLine=item._23ScoreLine.ToString(), Scoreline=item._23Score, Year="2023" },