From 46d5142d4ee07355345b7504031c3c8fa664fbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Tue, 19 Mar 2024 17:47:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=B9=E9=85=8D=E6=B2=B3?= =?UTF-8?q?=E5=8D=97=20bug=20fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- New_College.Api/New_College.Model.xml | 10 ++ New_College.Model/Models/T_TbSNeedDataInfo.cs | 9 +- .../ViewModels/Query/OneSubmitGoRequest.cs | 12 +- .../Result/TbSNeedDataInfoViewDto.cs | 4 +- .../BASE/IT_TbSNeedDataInfoRepository.cs | 4 + .../BASE/T_EnrollmentPlanedescRepository.cs | 34 ++++- .../BASE/T_TbSNeedDataInfoRepository.cs | 13 +- New_College.Services/D_LongIdMapServices.cs | 133 ++++++++++++++---- .../D_PlanMajorDescServices.cs | 27 +++- New_College.Services/V_VipCardInfoServices.cs | 1 + 10 files changed, 204 insertions(+), 43 deletions(-) diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index c6b1044..2153b6b 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -2967,6 +2967,11 @@ 所在地 + + + + + 用户跟角色关联表 @@ -4490,6 +4495,11 @@ 结束分数 + + + 批次类型名称(综合--文科 理科) + + 批次名称 diff --git a/New_College.Model/Models/T_TbSNeedDataInfo.cs b/New_College.Model/Models/T_TbSNeedDataInfo.cs index 4058726..e567015 100644 --- a/New_College.Model/Models/T_TbSNeedDataInfo.cs +++ b/New_College.Model/Models/T_TbSNeedDataInfo.cs @@ -12,7 +12,7 @@ namespace New_College.Model.Models /// /// 主键ID /// - [SugarColumn(ColumnName = "ID")] + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public long ID { get; set; } /// /// 招生类型 @@ -252,5 +252,12 @@ namespace New_College.Model.Models public string Location { get; set; } + /// + /// + /// + [SugarColumn(ColumnName = "SubjectType")] + public string SubjectType { get; set; } + + } } diff --git a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs index 87a7f2b..23726c6 100644 --- a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs +++ b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs @@ -34,6 +34,11 @@ namespace New_College.Model.ViewModels /// public int EndScore { get; set; } = 0; + + /// + /// 批次类型名称(综合--文科 理科) + /// + public string BatchTypeName { get; set; } = "综合"; /// ///批次名称 /// @@ -73,7 +78,7 @@ namespace New_College.Model.ViewModels /// /// 办学性质 0、公办，1、民办，2中外合作,3 港澳台 /// - public string Nature { get; set; } + public string Nature { get; set; } public string Ascription { get; set; } @@ -119,6 +124,9 @@ namespace New_College.Model.ViewModels /// public int CustomerId { get; set; } + + + } @@ -361,7 +369,7 @@ namespace New_College.Model.ViewModels /// 位次 /// public int RankLine { get; set; } - + ///// ///// 最低分 ///// diff --git a/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs b/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs index 41d3fb9..d056a82 100644 --- a/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs +++ b/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs @@ -11,7 +11,7 @@ namespace New_College.Model.ViewModels public class TbSNeedDataInfoViewDto { public long ID { get; set; } - + public string SubjectType { get; set; } public string EnrollmentType { get; set; } public string EnrollmentCode { get; set; } @@ -115,7 +115,7 @@ namespace New_College.Model.ViewModels public string _23Score { get; set; } - + public string SubjectType { get; set; } public string _23SchoolScore { get; set; } diff --git a/New_College.Repository/BASE/IT_TbSNeedDataInfoRepository.cs b/New_College.Repository/BASE/IT_TbSNeedDataInfoRepository.cs index e51b9f4..353c720 100644 --- a/New_College.Repository/BASE/IT_TbSNeedDataInfoRepository.cs +++ b/New_College.Repository/BASE/IT_TbSNeedDataInfoRepository.cs @@ -1,5 +1,7 @@ using New_College.IRepository.Base; using New_College.Model.Models; +using System.Collections.Generic; +using System.Threading.Tasks; namespace New_College.IRepository { @@ -8,5 +10,7 @@ namespace New_College.IRepository /// public interface IT_TbSNeedDataInfoRepository : IBaseRepository { + Task BatchUpdate(List t_TbSNeeds); + } } \ No newline at end of file diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index 5abf541..a2ff452 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -154,6 +154,21 @@ namespace New_College.Repository { query.provinceIds = new List() { 0 }; } + + if (string.IsNullOrWhiteSpace(query.SubjectClaim)) + { + return new MessageModel>() + { + msg = "选科参数必填", + success = false + }; + } + + var subjecttype = query.SubjectClaim.Length == 2 ? query.SubjectClaim : "综合"; + query.SubjectClaim = query.SubjectClaim.Length == 2 ? (query.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : query.SubjectClaim; + + + var regionlist = this.Db.Queryable().Where(c => c.Level == 1).WhereIF(query.provinceIds != null && query.provinceIds.Any(), c => SqlFunc.ContainsArray(query.provinceIds, c.KeyId)).Select(c => c.RegionName).ToList(); var claim = new string[] { }; @@ -163,12 +178,15 @@ namespace New_College.Repository float chongfirst = query.Score + 15; float chongend = query.Score + 5; float wenend = query.Score - 15; + var claim01 = ""; + var claim02 = ""; + var claim03 = ""; if (!string.IsNullOrWhiteSpace(query.SubjectClaim)) { claim = query.SubjectClaim.Split(","); - //sbuOne = claim[0]; - //sbuTwo = subjects[1]; - //sbuTree = subjects[2]; + claim01 = claim[0]; + claim02 = claim[1]; + claim03 = claim[2]; } var majornames = new List(); var majoraslist = new List(); @@ -185,13 +203,13 @@ namespace New_College.Repository .WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.Province)) //.WhereIF(query.Year > 0, p => p.Years == query.Year) .WhereIF(!string.IsNullOrEmpty(query.Location), p => p.Location == query.Location) + .Where(p => p.SubjectType == subjecttype) //.WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => int.Parse(p._23Score) > 0 && SqlFunc.Between(int.Parse(p._23Score), query.Score - 60, query.Score + 15)) - // .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => int.Parse(p._23Score) > 0 && SqlFunc.Between(int.Parse(p._23Score), query.Score, query.Score + 15)) .WhereIF(query.Type == "冲", p => int.Parse(p._23Score) > 0 && SqlFunc.Between(int.Parse(p._23Score), query.Score, query.Score + 15)) .WhereIF(query.Type == "稳", p => int.Parse(p._23Score) > 0 && SqlFunc.Between(int.Parse(p._23Score), query.Score - 26, query.Score - 1)) .WhereIF(query.Type == "保", p => int.Parse(p._23Score) > 0 && SqlFunc.Between(int.Parse(p._23Score), query.Score - 60, query.Score - 26)) - .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), c => SqlFunc.Contains(c._24subject, claim[0]) || SqlFunc.Contains(c._24subject, claim[1]) || SqlFunc.Contains(c._24subject, claim[2]) || c._24subject == "不限") + .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), c => SqlFunc.Contains(c._23subject, claim01) || SqlFunc.Contains(c._23subject, claim02) || SqlFunc.Contains(c._23subject, claim03) || c._23subject == "不限") .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorName)) .ToListAsync(); @@ -205,7 +223,7 @@ namespace New_College.Repository UniversityId = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName) != null ? universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Id : 0, AreaName = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName) != null ? recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).Province : "", UniversityCode = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName) != null ? recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).EnrollmentCode : "", - Rank = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).UniversityRank.ToString(), + Rank = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)!=null?recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).UniversityRank.ToString():"", _985 = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel != null ? (recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel.Contains("985") ? "是" : "否") : "否", _211 = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel != null ? (recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel.Contains("211") ? "是" : "否") : "否", _SYL = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel != null ? (recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel.Contains("双一流") ? "是" : "否") : "否", @@ -244,6 +262,9 @@ namespace New_College.Repository /// public async Task> GetRecommendUniversity(RecommendUniversityQuery query) { + var subjecttype = query.SubjectClaim.Length == 2 ? query.SubjectClaim : "综合"; + query.SubjectClaim = query.SubjectClaim.Length == 2 ? (query.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : query.SubjectClaim; + RefAsync totalNumber = 0; var maxscore = query.Score + 10; var minscore = query.Score - 10; @@ -253,6 +274,7 @@ namespace New_College.Repository //} var recommendInfo = await this.Db.Queryable((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id }) .Where((plans, universitys) => plans.Location == query.Location) + .Where((plans, universitys) => plans.SubjectType == subjecttype) .Where((plans, universitys) => plans.Years == query.Year) .WhereIF(query.SubjectLevel > 0, (plans, universitys) => universitys.Subject_Level == query.SubjectLevel) .WhereIF(query.Type >= 0, (plans, universitys) => universitys.Type == query.Type) diff --git a/New_College.Repository/BASE/T_TbSNeedDataInfoRepository.cs b/New_College.Repository/BASE/T_TbSNeedDataInfoRepository.cs index 9f73630..f46ab4d 100644 --- a/New_College.Repository/BASE/T_TbSNeedDataInfoRepository.cs +++ b/New_College.Repository/BASE/T_TbSNeedDataInfoRepository.cs @@ -2,16 +2,23 @@ using New_College.IRepository.UnitOfWork; using New_College.Model.Models; using New_College.Repository.Base; +using System.Collections.Generic; +using System.Threading.Tasks; namespace New_College.Repository { - /// - /// T_TbSNeedDataInfoRepository - /// + /// + /// T_TbSNeedDataInfoRepository + /// public class T_TbSNeedDataInfoRepository : BaseRepository, IT_TbSNeedDataInfoRepository { public T_TbSNeedDataInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork) { } + + public async Task BatchUpdate(List t_TbSNeeds) + { + return await this.Db.Fastest().BulkUpdateAsync(t_TbSNeeds); + } } } \ No newline at end of file diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index de5b742..200fe75 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -1990,9 +1990,94 @@ namespace New_College.Services /// public async Task UpdatePlanProInf() { - var tbinfo = await t_TbSNeedDataInfoRepository.Query(); - var universitylist = await d_UniversityRepository.Query(); - var majorlist = await d_MajorRepository.Query(); + var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "河南省"); + //var universitylist = await d_UniversityRepository.Query(); + //var majorlist = await d_MajorRepository.Query(); + + + + + + + + #region************************更新招生计划合计**************************** + + + // var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == "河南省" && e.Years == 2021); + + //var qliylist = await d_QualificationLineRepository.Query(e => e.Location == "河南省" && e.Years == 2022); + //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "河南省" && c.Years == 2021 && c.IsDelete == false); + // tbinfo.ForEach(o => + // { + //if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) + //{ + // o._21Count = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString(); + // // o.AcademicYear = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().AcademicYear; + //} + //if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) + //{ + // o._21Score = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString(); + // o._21ScoreLine = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString(); + //} + //if (qliylist.Any(e => e.UniversityName == o.UniversityName)) + //{ + // o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString(); + // o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString(); + // //o._23SchoolAvgScore= + //} + + + // }); + + // await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); + + + #endregion************************更新招生计划合计**************************** + + #region ***********************更新相关参数*************************** + + var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); + + tbinfo.ForEach(e => + { + + if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName)) + { + + e.UniversityRank = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().UniversityRank; + e.City = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().City; + e.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EmploymentQuality; + e.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EnrollmentCode; + if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName))) + { + e.Fee = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().Fee; + e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel; + e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel; + e.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel; + e.FirstType = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().FirstType; + } + + + e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel; + + e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree; + e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor; + + e.Nature = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Nature; + e.Ownership = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Ownership; + e.PhDMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDMajor; + e.PhDPoint = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDPoint; + e.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().ProfessionalAssessment; + e.Province = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Province; + e.VRUrl = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().VRUrl; + } + }); + await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); + + #endregion + + + #region 院校专业关联 @@ -2033,30 +2118,30 @@ namespace New_College.Services //var universitylist=await un #region 更新专业计划信息 - var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0); - plist.ForEach(p => - { - var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault(); - if (newmodel != null) - { - p.CityName = newmodel.City; - p.EducationCategory = newmodel.EducationCategory; - // p.EnrollmentCode = newmodel.EnrollmentCode; - p.EnrollmentType = newmodel.EnrollmentType; - //p.SchoolType=newmodel.sch - p.FirstType = newmodel.FirstType; - p.Nature = newmodel.Nature; - p.Ownership = newmodel.Ownership; - p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count); - p.PlanCount = int.Parse(newmodel._23Count); - p.LowScore = int.Parse(newmodel._23Score); - p.LowScoreRank = int.Parse(newmodel._23ScoreLine); + //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0); + //plist.ForEach(p => + //{ + // var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault(); + // if (newmodel != null) + // { + // p.CityName = newmodel.City; + // p.EducationCategory = newmodel.EducationCategory; + // // p.EnrollmentCode = newmodel.EnrollmentCode; + // p.EnrollmentType = newmodel.EnrollmentType; + // //p.SchoolType=newmodel.sch + // p.FirstType = newmodel.FirstType; + // p.Nature = newmodel.Nature; + // p.Ownership = newmodel.Ownership; + // p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count); + // p.PlanCount = int.Parse(newmodel._23Count); + // p.LowScore = int.Parse(newmodel._23Score); + // p.LowScoreRank = int.Parse(newmodel._23ScoreLine); - } + // } - }); + //}); - await this.d_PlanMajorDescProRepository.Batchupdate(plist); + //await this.d_PlanMajorDescProRepository.Batchupdate(plist); #endregion diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index eacde34..7ff9dae 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -18,6 +18,7 @@ using New_College.Repository; using System.Data.Entity.Infrastructure; using NPOI.SS.Formula.Functions; using StackExchange.Profiling.Internal; +using System.Collections; namespace New_College.Services { @@ -61,6 +62,10 @@ namespace New_College.Services public async Task GetAIPerview(OneSubmitGoRequest request) { + + var subjecttype = request.SubjectClaim.Length == 2 ? request.SubjectClaim : "综合"; + request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim; + var aidto = new AIPerviewDto(); int startscore = request.Score - 60; int endscore = request.Score + 15; @@ -68,6 +73,7 @@ namespace New_College.Services var natureNames = NatureHelper.NatureNames(request.Nature); Expression> expression = Expressionable.Create() .And(c => c.Location == request.Location) + .And(c => c.SubjectType == subjecttype) .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major)) .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c._23subject, claim[0]) || SqlFunc.Contains(c._23subject, claim[1]) || SqlFunc.Contains(c._23subject, claim[2]) || c._23subject == "不限") .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) @@ -76,8 +82,10 @@ namespace New_College.Services .AndIF(request._985.HasValue && request._985 == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "985")) .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => SqlFunc.ContainsArray(natureNames, c.Nature)) - .AndIF(request.EndScore > request.StartScore, c => SqlFunc.Between(c._23SchoolScore, startscore, endscore)) + .AndIF(request.EndScore > request.StartScore, c => SqlFunc.Between(c._23Score, startscore, endscore)) .ToExpression(); + + var querylist = (await t_TbSNeedDataInfoPev.Query(expression)).Select(c => new TbSNeedDataInfoPerviewViewDto() { //ID = c.ID, @@ -169,8 +177,15 @@ namespace New_College.Services int startscore = request.Score - 60; int endscore = request.Score + 15; int qyear = request.Year >= 2023 ? 2023 : request.Year; - var batlist = await _batchlineRepository.Query(c => c.Year == qyear && c.Type_name == "综合"); - request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段"; + var batlist = await _batchlineRepository.Query(c => c.Year == qyear && c.AreaName == request.Location && c.IsDelete == false && c.Type_name == request.BatchTypeName); + if (request.Location == "河南省") + { + 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 + { + request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段"; + } Expression> expression = Expressionable.Create() .And(c => c.Years == qyear) .And(c => c.IsDelete == false) @@ -179,8 +194,9 @@ namespace New_College.Services .AndIF(!string.IsNullOrWhiteSpace(request.Name), c => SqlFunc.Contains(c.UniversityName, request.Name)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName)) .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SubjectType == request.SchoolType) - .AndIF(request.Score > 0 && (request.EndScore <= endscore && request.StartScore >= startscore), c => SqlFunc.Between(c.LowScore, startscore, endscore)) - .AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c.LowScore, request.StartScore, request.EndScore)) + //.AndIF(request.Score > 0 && (request.EndScore <= endscore && request.StartScore >= startscore), c => SqlFunc.Between(c.LowScore, startscore, endscore)) + //.AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c.LowScore, request.StartScore, request.EndScore)) + .AndIF(request.EndScore > request.StartScore, c => SqlFunc.Between(c.LowScore, request.StartScore, request.EndScore)) .AndIF(request.Syl.HasValue && request.Syl == 1, c => c._SYL == "是") .AndIF(request._211.HasValue && request._211 == 1, c => c._211 == "是") .AndIF(request._985.HasValue && request._985 == 1, c => c._985 == "是") @@ -197,6 +213,7 @@ namespace New_College.Services Expression> expression3 = Expressionable.Create() .And(c => c.Location == request.Location) + .And(c => c.SubjectType == request.BatchTypeName) .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major)) // .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, request.SubjectClaim)) //此条件不带 .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c._24subject, claim[0]) || SqlFunc.Contains(c._24subject, claim[1]) || SqlFunc.Contains(c._24subject, claim[2]) || c._24subject == "不限") diff --git a/New_College.Services/V_VipCardInfoServices.cs b/New_College.Services/V_VipCardInfoServices.cs index 0bef994..9802868 100644 --- a/New_College.Services/V_VipCardInfoServices.cs +++ b/New_College.Services/V_VipCardInfoServices.cs @@ -49,6 +49,7 @@ namespace New_College.Services if (cardinfo == null || cardinfo != null && cardinfo.IsBind == 1) return new MessageModel() { success = false, msg = "会员卡号有误或已被绑定" }; cardinfo.IsBind = 1; + cardinfo.ModifyTime = DateTime.Now; cardinfo.EndTime = DateTime.Now.AddDays(cardinfo.Day); var result = await _dal.Update(cardinfo); if (result == false)