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

--ranl调整查询条件

develop
liuyangyi 2024-06-10 20:13:39 +08:00
parent 1cc4fdcf9c
commit 685c86ac1a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ namespace New_College.Api.Controllers.Front
AreaName = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "", AreaName = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "",
Nature = planstatus ? firstmodels.Nature != null ? firstmodels.Nature : "" : "", 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() planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem()
{ {

5
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -180,7 +180,7 @@ namespace New_College.Services
int endscore = request.Score + 15; int endscore = request.Score + 15;
int qyear = request.Year >= 2023 ? 2023 : request.Year; 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; request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim;
var claim01 = ""; var claim01 = "";
var claim02 = ""; var claim02 = "";
@ -344,7 +344,8 @@ namespace New_College.Services
public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request) public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request)
{ {
var pagemodel = new PageModel<OneSubmitGoResponse>(); var pagemodel = new PageModel<OneSubmitGoResponse>();
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; request.PageSize = request.PageSize < 100 ? 100 : request.PageSize;
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; request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim;