From 685c86ac1aad3c446dcc012b8a3d3e1285f9f8a5 Mon Sep 17 00:00:00 2001 From: liuyangyi Date: Mon, 10 Jun 2024 20:13:39 +0800 Subject: [PATCH] =?UTF-8?q?--ranl=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- New_College.Api/Controllers/Front/PcVolunteerController.cs | 2 +- New_College.Services/D_PlanMajorDescServices.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index d37659c..a40014e 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -157,7 +157,7 @@ namespace New_College.Api.Controllers.Front AreaName = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "", Nature = planstatus ? firstmodels.Nature != null ? firstmodels.Nature : "" : "", - Rank = planstatus ? (string.IsNullOrEmpty(firstmodels.UniversityRank) ? "--" : firstmodels.UniversityRank) : "--", + Rank = planstatus ? ((string.IsNullOrEmpty(firstmodels.UniversityRank) || firstmodels.UniversityRank =="0") ? "--" : firstmodels.UniversityRank) : "--", planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem() { diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index 1844340..85c1357 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -180,7 +180,7 @@ namespace New_College.Services int endscore = request.Score + 15; int qyear = request.Year >= 2023 ? 2023 : request.Year; - string batchtypeName = request.SubjectClaim.Length > 2 ? "综合": request.SubjectClaim; + string batchtypeName = request.SubjectClaim.Length > 2 ? "综合" : request.SubjectClaim; request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim; var claim01 = ""; var claim02 = ""; @@ -344,7 +344,8 @@ namespace New_College.Services public async Task> GetPlanMajorList(OneSubmitGoRequest request) { var pagemodel = new PageModel(); - var NatureNames = NatureHelper.NatureNames(request.Nature); + // var NatureNames = NatureHelper.NatureNames(request.Nature); + var NatureNames = !string.IsNullOrWhiteSpace(request.Nature) ? request.Nature.Split(",") : null; request.PageSize = request.PageSize < 100 ? 100 : request.PageSize; string batchtypeName = request.SubjectClaim.Length == 2 ? request.SubjectClaim : "综合"; request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim;