From 659389d8ef319ffb65e26ad3bdfe5c8b7026ed4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 25 Jun 2024 15:05:42 +0800
Subject: [PATCH] bug fixed
---
.../Controllers/Front/PcVolunteerController.cs | 3 ++-
New_College.Api/New_College.Model.xml | 10 ++++++++++
.../ViewModels/VolunteerTableDtoView.cs | 13 +++++++++++++
New_College.Services/D_PlanMajorDescServices.cs | 9 ++++++---
4 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs
index 2dc6afd..0a8e666 100644
--- a/New_College.Api/Controllers/Front/PcVolunteerController.cs
+++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs
@@ -271,6 +271,7 @@ namespace New_College.Api.Controllers.Front
AcademicYear = a.AcademicYear,
Sort = s.OrderSort,
MajorSubjectClam = a._23subject,
+ Percentage = typeinfo.Where(e => e.planId == a.ID).FirstOrDefault().tage.ToString() + "%",
_23PlanCount = a._23Count == "0" ? "--" : a._23Count,
_22PlanCount = a._22Count == "0" ? "--" : a._22Count,
_21PlanCount = a._21Count == "0" ? "--" : a._21Count,
@@ -278,7 +279,7 @@ namespace New_College.Api.Controllers.Front
_21Scoreline = a._21Score == "0" ? "--" : a._21Score,
_22RankLine = a._22ScoreLine == "0" ? "--" : a._22ScoreLine,
_22Scoreline = a._22Score == "0" ? "--" : a._22Score,
- _23RankLine = a._23ScoreLine == 0? "--" : a._23ScoreLine.ToString(),
+ _23RankLine = a._23ScoreLine == 0 ? "--" : a._23ScoreLine.ToString(),
_23Scoreline = a._23Score == "0" ? "--" : a._23Score,
});
});
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index b789511..1237bbe 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -7971,6 +7971,16 @@
专业名称
+
+
+ 冲稳保
+
+
+
+
+ 录取概率
+
+
专业选科
diff --git a/New_College.Model/ViewModels/VolunteerTableDtoView.cs b/New_College.Model/ViewModels/VolunteerTableDtoView.cs
index 44efa62..d54d106 100644
--- a/New_College.Model/ViewModels/VolunteerTableDtoView.cs
+++ b/New_College.Model/ViewModels/VolunteerTableDtoView.cs
@@ -169,6 +169,19 @@ namespace New_College.Model.ViewModels
[ExcelColumnName("专业名称")]
public string Major { get; set; }
+
+ ///
+ /// 冲稳保
+ ///
+ [ExcelColumnName("冲稳保")]
+ public string Type { get; set; }
+
+ ///
+ /// 录取概率
+ ///
+ [ExcelColumnName("录取概率")]
+ public string Percentage { get; set; }
+
/////
///// 专业备注
/////
diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs
index 1eb59f6..d772f4b 100644
--- a/New_College.Services/D_PlanMajorDescServices.cs
+++ b/New_College.Services/D_PlanMajorDescServices.cs
@@ -198,14 +198,16 @@ namespace New_College.Services
{
request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "本科一批").Any() ? "本科一批" : batlist.Where(c => c.Average <= request.Score && c.Batch_name == "本科二批").Any() ? "本科二批" : "专科批";
}
+ else if (request.Location == "上海市")
+ {
+ request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "本科").Any() ? "本科" : "专科";
+ }
else
{
request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段";
}
-
-
-
+ qyear = qyear > 2023 ? 2023 : qyear;
Expression> expression = Expressionable.Create()
.And(c => c.Years == qyear)
.And(c => c.IsDelete == false)
@@ -320,6 +322,7 @@ namespace New_College.Services
}).ToList();
});
+ //var list = responselist;
return new AIGOPageModel()
{
data = responselist.Where(e => e.planCount > 0).ToList(),