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

bug fixed

develop
old易 2024-06-25 15:05:42 +08:00
parent ac2530a195
commit 659389d8ef
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -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,

10
New_College.Api/New_College.Model.xml
View File

@ -7971,6 +7971,16 @@
专业名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.Type">
<summary>
冲稳保
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.Percentage">
<summary>
录取概率
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.MajorSubjectClam">
<summary>
专业选科

13
New_College.Model/ViewModels/VolunteerTableDtoView.cs
View File

@ -169,6 +169,19 @@ namespace New_College.Model.ViewModels
[ExcelColumnName("专业名称")]
public string Major { get; set; }
/// <summary>
/// 冲稳保
/// </summary>
[ExcelColumnName("冲稳保")]
public string Type { get; set; }
/// <summary>
/// 录取概率
/// </summary>
[ExcelColumnName("录取概率")]
public string Percentage { get; set; }
///// <summary>
///// 专业备注
///// </summary>

9
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -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<Func<D_QualificationLine, bool>> expression = Expressionable.Create<D_QualificationLine>()
.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<AIGOResponse>()
{
data = responselist.Where(e => e.planCount > 0).ToList(),