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

feat:bug fixed

develop
old易 2023-11-21 17:53:45 +08:00
parent 8e6034d052
commit c9390b8982
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -12,6 +12,7 @@ using System;
using System.Linq; using System.Linq;
using New_College.Common; using New_College.Common;
using New_College.IRepository; using New_College.IRepository;
using LinqKit;
namespace New_College.Services namespace New_College.Services
{ {
@ -38,6 +39,8 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<AIGOPageModel<AIGOResponse>> GetAIGoList(OneSubmitGoRequest request) public async Task<AIGOPageModel<AIGOResponse>> GetAIGoList(OneSubmitGoRequest request)
{ {
var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
var pagemodel = new AIGOPageModel<AIGOResponse>(); var pagemodel = new AIGOPageModel<AIGOResponse>();
int startscore = request.Score - 15; int startscore = request.Score - 15;
int endscore = request.Score + 15; int endscore = request.Score + 15;
@ -65,7 +68,8 @@ namespace New_College.Services
.And(c => c.IsDelete == false) .And(c => c.IsDelete == false)
.And(c => c.Location == request.Location) .And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major)) .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, request.SubjectClaim)) //此条件不带 // .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, request.SubjectClaim)) //此条件不带
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, claim[0]) || SqlFunc.Contains(c.SelectSubject, claim[1]) || SqlFunc.Contains(c.SelectSubject, claim[2]))
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName) .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType) .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType)
@ -128,9 +132,9 @@ namespace New_College.Services
return new AIGOPageModel<AIGOResponse>() return new AIGOPageModel<AIGOResponse>()
{ {
data = responselist, data = responselist,
c = responselist.Select(c => c.Type == 2).Count(), c = responselist.Where(c => c.Type == 2).Count(),
w = responselist.Select(c => c.Type == 1).Count(), w = responselist.Where(c => c.Type == 1).Count(),
b = responselist.Select(c => c.Type == 0).Count(), b = responselist.Where(c => c.Type == 0).Count(),
dataCount = query.dataCount, dataCount = query.dataCount,
page = query.page, page = query.page,
pageCount = query.pageCount, pageCount = query.pageCount,
@ -147,13 +151,13 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request) public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request)
{ {
var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
var pagemodel = new PageModel<OneSubmitGoResponse>(); var pagemodel = new PageModel<OneSubmitGoResponse>();
Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>() Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>()
.And(c => c.IsDelete == false) .And(c => c.IsDelete == false)
.And(c => c.Location == request.Location) .And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, claim[0]) || SqlFunc.Contains(c.SelectSubject, claim[1]) || SqlFunc.Contains(c.SelectSubject, claim[2]))
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major)) .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject))
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName)) .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName))
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
.And(c => c.Years == request.Year) .And(c => c.Years == request.Year)
@ -166,6 +170,8 @@ namespace New_College.Services
.AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature)
//.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间 //.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间
.ToExpression(); .ToExpression();
var query = await _dal.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); var query = await _dal.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc ");
var majorarry = query.data.Select(c => c.Major).Distinct().ToArray(); var majorarry = query.data.Select(c => c.Major).Distinct().ToArray();