From 13d4ede4853abcdaa2183e9768d5f95c23559c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Thu, 11 Jul 2024 10:09:36 +0800 Subject: [PATCH] bug fixed --- .../BASE/T_EnrollmentPlanedescRepository.cs | 2 +- New_College.Services/D_PlanMajorDescServices.cs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index 19dcb58..0624ffb 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -200,7 +200,7 @@ namespace New_College.Repository majornames = majoraslist.Select(x => x.MajorName).ToList(); } StringBuilder sqlstr = new StringBuilder(); - sqlstr.AppendFormat("SELECT * from T_TbSNeedDataInfo where SubjectType='{0}' ", subjecttype); + sqlstr.AppendFormat("SELECT * from T_TbSNeedDataInfo where SubjectType='{0}' and _plancount>0 ", subjecttype); if (regionlist.Any()) { diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index e855205..8c224c7 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -365,25 +365,23 @@ namespace New_College.Services claim02 = claim[1]; claim03 = claim[2]; } - //request.PageSize = 150;//山东省 request.Year = request.Year > 2024 ? 2024 : request.Year; // var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); Expression> expression3 = Expressionable.Create() .And(c => c.Location == request.Location) .And(c => c.SubjectType == batchtypeName) - .And(c => c._23ScoreLine > 0) + .AndIF(request.Score > 0 && (request.BatchName.Contains("本科") || request.BatchName.Contains("一段")), c => c._23ScoreLine > 0) .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => (!SqlFunc.Contains(c._24subject, "&") && SqlFunc.Contains(c._24subject, claim01) || SqlFunc.Contains(c._24subject, claim02) || SqlFunc.Contains(c._24subject, claim03) || c._24subject == "不限") || (SqlFunc.Contains(c._24subject, "&") && SqlFunc.Contains(c._24subject, claim01) && SqlFunc.Contains(c._24subject, claim02) && SqlFunc.Contains(c._24subject, claim03)) ) - - .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) //.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType) - .AndIF(request.Score > 0, c => SqlFunc.Between(c._23Score, request.Score - 60, request.Score + 15)) + .AndIF(request.Score > 0&&(request.BatchName.Contains("本科")||request.BatchName.Contains("一段")), c => SqlFunc.Between(c._23Score, request.Score - 60, request.Score + 15)) + .AndIF(request.Score > 0 && (request.BatchName.Contains("专科") || request.BatchName.Contains("二段")), c => SqlFunc.Between(c._23Score, request.Score - 150, request.Score + 20)) .AndIF(request.Syl.HasValue && request.Syl == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "双一流")) .AndIF(request._211.HasValue && request._211 == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "211")) .AndIF(request._985.HasValue && request._985 == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "985"))