diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 9a9f936..ada98ec 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -32,12 +32,15 @@ namespace New_College.Api.Controllers.Front private readonly IU_VolunteerTableDetailServices _VolunteerTableDetailServices; private readonly IUnitOfWork _unitOfWork; private readonly ID_PlanMajorDescServices _planMajorDescServices; - public PcVolunteerController(IU_VolunteerTableServices volunteerTableServices, IU_VolunteerTableDetailServices volunteerTableDetailServices, IUnitOfWork unitOfWork, ID_PlanMajorDescServices planMajorDescServices) + private readonly IT_TbSNeedDataInfoServices _TbSNeedDataInfoServices; + public PcVolunteerController(IU_VolunteerTableServices volunteerTableServices, IU_VolunteerTableDetailServices volunteerTableDetailServices, + IUnitOfWork unitOfWork, ID_PlanMajorDescServices planMajorDescServices, IT_TbSNeedDataInfoServices tbSNeedDataInfoServices) { _VolunteerTableServices = volunteerTableServices; _VolunteerTableDetailServices = volunteerTableDetailServices; _unitOfWork = unitOfWork; _planMajorDescServices = planMajorDescServices; + _TbSNeedDataInfoServices = tbSNeedDataInfoServices; } diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index d578b28..52227bd 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -6955,16 +6955,6 @@ 院校编码 - - - 是否211 - - - - - 是否双一流 - - @@ -6995,6 +6985,11 @@ + + + 选科 + + 冲稳保返回 diff --git a/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs b/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs index 59f7a69..7934c4b 100644 --- a/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs +++ b/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs @@ -33,6 +33,8 @@ namespace New_College.Model.ViewModels /// public string UserPwd { get; set; } + public string UserCode { get; set; } + /// /// 用户头像 /// diff --git a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs index faf435b..97815eb 100644 --- a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs +++ b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs @@ -349,6 +349,7 @@ namespace New_College.Model.ViewModels /// 位次 /// public int RankLine { get; set; } + ///// ///// 最低分 ///// diff --git a/New_College.Model/ViewModels/Result/CustomerInfoResult.cs b/New_College.Model/ViewModels/Result/CustomerInfoResult.cs index 994c77e..b4fd525 100644 --- a/New_College.Model/ViewModels/Result/CustomerInfoResult.cs +++ b/New_College.Model/ViewModels/Result/CustomerInfoResult.cs @@ -89,6 +89,8 @@ namespace New_College.Model.ViewModels public CustomerTypeEnum CustomerType { get; set; } + public string UserCode { get; set; } + /// /// 学届 /// diff --git a/New_College.Model/ViewModels/Result/VolunteerResult.cs b/New_College.Model/ViewModels/Result/VolunteerResult.cs index b0bc92d..59fd356 100644 --- a/New_College.Model/ViewModels/Result/VolunteerResult.cs +++ b/New_College.Model/ViewModels/Result/VolunteerResult.cs @@ -90,15 +90,17 @@ namespace New_College.Model.ViewModels public string AreaName { get; set; } - public int? Nhef { get; set; } - /// - /// 是否211 - /// - public int? Sff { get; set; } - /// - /// 是否双一流 - /// - public int? Syl { get; set; } + public string CityName { get; set; } + + //public int? Nhef { get; set; } + ///// + ///// 是否211 + ///// + //public int? Sff { get; set; } + ///// + ///// 是否双一流 + ///// + //public int? Syl { get; set; } public string _985 { get; set; } @@ -121,13 +123,14 @@ namespace New_College.Model.ViewModels ///// //public string RankLine { get; set; } - public float Scoreline { get; set; } + public int SchoolLowScore { get; set; } + public float SchoolScoreline { get; set; } public int planCount { get; set; } - public int PlanId { get; set; } + //public int PlanId { get; set; } /// /// 对应的Ids /// - public List PlanIds { get; set; } + public List PlanIds { get; set; } /// /// 对应专业数 @@ -145,6 +148,8 @@ namespace New_College.Model.ViewModels //public string BatchtypeId { get; set; } public string Web { get; set; } public string AscriptionName { get; set; } + + public int Percentage { get; set; } } /// @@ -156,7 +161,7 @@ namespace New_College.Model.ViewModels public int PlanNum { get; set; } public string Year { get; set; } public string Money { get; set; } - public int MajorId { get; set; } + public long MajorId { get; set; } public float Scoreline { get; set; } /// @@ -168,6 +173,13 @@ namespace New_College.Model.ViewModels /// /// public int Percentage { get; set; } + + /// + /// 选科 + /// + public string Subject { get; set; } + + public List planItems { get; set; } } /// diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index a1e6dec..9d62f85 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -30,6 +30,7 @@ namespace New_College.Repository private readonly ID_PlanMajorScoreLineRepository planMajorScoreLine; private readonly ID_UniversityRepository d_University; private readonly ISysRegionRepository _sysRegionRepository; + private readonly IT_TbSNeedDataInfoRepository t_TbSNeedDataInfo; public T_EnrollmentPlanedescRepository(IUnitOfWork unitOfWork, IV_CustomerInfoRepository _CustomerInfoRepository, IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository, @@ -37,7 +38,8 @@ namespace New_College.Repository ID_PlanMajorDescRepository planMajorDesc, ID_PlanMajorScoreLineRepository planMajorScoreLine, ID_UniversityRepository d_University, - ISysRegionRepository sysRegionRepository) : base(unitOfWork) + ISysRegionRepository sysRegionRepository, + IT_TbSNeedDataInfoRepository tbSNeedDataInfo) : base(unitOfWork) { this.v_CustomerInfo = _CustomerInfoRepository; this.t_EnrollmentPlane = t_EnrollmentPlaneRepository; @@ -46,6 +48,7 @@ namespace New_College.Repository this.planMajorScoreLine = planMajorScoreLine; this.d_University = d_University; this._sysRegionRepository = sysRegionRepository; + this.t_TbSNeedDataInfo = tbSNeedDataInfo; } @@ -83,34 +86,56 @@ namespace New_College.Repository // return new MessageModel>() { success = false, msg = "所选专业大类数据完善中..." }; majornames = majoraslist.Select(x => x.MajorCode).ToList(); } - var recommendInfo = await this.Db.Queryable() - .WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.AreaName)) - .WhereIF(query.Year > 0, p => p.Years == query.Year) + + + + var recommandinfo = await this.Db.Queryable() + .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) - .WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) - .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => p.LowScore > 0 && (p.LowScore <= query.Score + 15)) - .WhereIF(query.Type == "冲", p => p.LowScore > 0 && (p.LowScore <= query.Score + 15 && p.LowScore > query.Score + 5)) - .WhereIF(query.Type == "稳", p => p.LowScore > 0 && (p.LowScore <= query.Score + 5 && p.LowScore > query.Score - 15)) - .WhereIF(query.Type == "保", p => p.LowScore > 0 && (p.LowScore < query.Score - 15)) - .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p.SelectSubject, sbuOne) || SqlFunc.Contains(p.SelectSubject, sbuTwo) || SqlFunc.Contains(p.SelectSubject, sbuTree))) + // .WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) + .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15)) + .WhereIF(query.Type == "冲", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15 && int.Parse(p._23Score) > query.Score + 5)) + .WhereIF(query.Type == "稳", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 5 && int.Parse(p._23Score) > query.Score - 15)) + .WhereIF(query.Type == "保", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) < query.Score - 15)) + .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p._23subject, sbuOne) || SqlFunc.Contains(p._23subject, sbuTwo) || SqlFunc.Contains(p._23subject, sbuTree))) .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode)) - .WhereIF(query.UniversityIds.Any() && query.UniversityIds.Count() > 0, p => SqlFunc.ContainsArray(query.UniversityIds, p.UId)) - .Select(p => new UniversityEnrollmentPlanResult() - { - UniversityId = p.UId, - PlanId = p.Id, - // Scoreline = p.LowScore - }) + //.WhereIF(query.UniversityIds.Any() && query.UniversityIds.Count() > 0, p => SqlFunc.ContainsArray(query.UniversityIds, p.UId)) + .Select(p => new UniversityEnrollmentPlanResult() + { + // UniversityId = p.UId, + //PlanId = p.Id, + // Scoreline = p.LowScore + }) .ToListAsync(); - var universitylist = recommendInfo.Select(c => c.UniversityId).Distinct().ToList(); - universitylist.ForEach(a => - { - response.Add(new UniversityMapMajorItems() - { - UId = a, - MIds = recommendInfo.Where(e => e.UniversityId == a).Select(c => c.PlanId).ToList() - }); - }); + // var recommendInfo = await this.Db.Queryable() + // .WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.AreaName)) + //.WhereIF(query.Year > 0, p => p.Years == query.Year) + //.WhereIF(!string.IsNullOrEmpty(query.Location), p => p.Location == query.Location) + //.WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) + //.WhereIF(string.IsNullOrWhiteSpace(query.Type), p => p.LowScore > 0 && (p.LowScore <= query.Score + 15)) + //.WhereIF(query.Type == "冲", p => p.LowScore > 0 && (p.LowScore <= query.Score + 15 && p.LowScore > query.Score + 5)) + //.WhereIF(query.Type == "稳", p => p.LowScore > 0 && (p.LowScore <= query.Score + 5 && p.LowScore > query.Score - 15)) + //.WhereIF(query.Type == "保", p => p.LowScore > 0 && (p.LowScore < query.Score - 15)) + //.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p.SelectSubject, sbuOne) || SqlFunc.Contains(p.SelectSubject, sbuTwo) || SqlFunc.Contains(p.SelectSubject, sbuTree))) + //.WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode)) + // .WhereIF(query.UniversityIds.Any() && query.UniversityIds.Count() > 0, p => SqlFunc.ContainsArray(query.UniversityIds, p.UId)) + //.Select(p => new UniversityEnrollmentPlanResult() + //{ + // UniversityId = p.UId, + // PlanId = p.Id, + // // Scoreline = p.LowScore + //}) + //.ToListAsync(); + // var universitylist = recommendInfo.Select(c => c.UniversityId).Distinct().ToList(); + // universitylist.ForEach(a => + // { + // response.Add(new UniversityMapMajorItems() + // { + // UId = a, + // MIds = recommendInfo.Where(e => e.UniversityId == a).Select(c => c.PlanId).ToList() + // }); + // }); return new MessageModel>() { response = response }; } @@ -156,73 +181,45 @@ namespace New_College.Repository return new MessageModel>() { success = false, msg = "所选专业大类数据完善中..." }; majornames = majoraslist.Select(x => x.MajorName).ToList(); } - - - var recommendInfo = await this.Db.Queryable() - .WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.AreaName)) - .WhereIF(query.Year > 0, p => p.Years == query.Year) + var recommendInfo = await this.Db.Queryable() + .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) - .WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) - .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => p.LowScore > 0 && (p.LowScore <= query.Score + 15)) - .WhereIF(query.Type == "冲", p => p.LowScore > 0 && (p.LowScore <= query.Score + 15 && p.LowScore > query.Score + 5)) - .WhereIF(query.Type == "稳", p => p.LowScore > 0 && (p.LowScore <= query.Score + 5 && p.LowScore > query.Score - 15)) - .WhereIF(query.Type == "保", p => p.LowScore > 0 && (p.LowScore < query.Score - 15)) - .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p.SelectSubject, sbuOne) || SqlFunc.Contains(p.SelectSubject, sbuTwo) || SqlFunc.Contains(p.SelectSubject, sbuTree))) - .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.Major)).GroupBy(plans => new - { - // plans.Id, - plans.UId, - plans.UniversityName, - plans.EnrollmentCode - //plans.AreaName, - //plans.Ownership, - //plans._211, - //plans._985, - //plans._SYL, - //plans.SubjectType, - // plans.LowScore, - // plans.LowScoreRank - }) - .Select(p => new UniversityEnrollmentPlanResult() - { - // AreaName = p.AreaName, - UniversityId = p.UId, - // AscriptionName=p.Ownership, - //_211=p._211, - //_985=p._985, - //_SYL=p._SYL, - // Type= p.SubjectType, - // Logo = universitys.Logo, - // Nhef = universitys.Nhef, - // Rank = universitys.Rank <= 0 ? "--" : universitys.Rank.ToString(), - UniversityName = p.UniversityName, - UniversityCode = p.EnrollmentCode, - planCount = SqlFunc.AggregateSum(p.PlanCount),// plandesc.Where(x => x.UniversityId == item.Id).Select(x => x.Id).ToList() - //PlanIds= SqlFunc.Subqueryable().Where(s=>s.Id==p.Id).ToList(s => s.Id), - MjaorPlan = SqlFunc.AggregateCount(p.UId), - Scoreline = SqlFunc.AggregateMin(p.LowScore), + //.WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) + .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15)) + .WhereIF(query.Type == "冲", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15 && int.Parse(p._23Score) > query.Score + 5)) + .WhereIF(query.Type == "稳", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 5 && int.Parse(p._23Score) > query.Score - 15)) + .WhereIF(query.Type == "保", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) < query.Score - 15)) + .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p._23subject, sbuOne) || SqlFunc.Contains(p._23subject, sbuTwo) || SqlFunc.Contains(p._23subject, sbuTree))) + .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode)) + .ToListAsync(); - - }).OrderBy(p => p.Scoreline, OrderByType.Desc) - .ToPageListAsync(query.PageIndex, query.PageSize, totalNumber); - - var universitylist = (await d_University.Query(c => SqlFunc.ContainsArray(recommendInfo.Select(c => c.UniversityId).ToList(), c.Id))).Select(c => new + var universitylist = recommendInfo.GroupBy(g => g.UniversityName).Select(c => new UniversityEnrollmentPlanResult() { UniversityName = c.Key }).ToList(); + var universitytemps = (await d_University.Query(c => SqlFunc.ContainsArray(recommendInfo.Select(c => c.UniversityName).ToList(), c.Name))).Select(c => new D_University() - { Id = c.Id, Logo = c.Logo }).ToList(); - recommendInfo.ForEach(a => + { Id = c.Id, Logo = c.Logo, Name = c.Name }).ToList(); + var ulist = universitylist.Select(s => new UniversityEnrollmentPlanResult() { - //a.AreaName = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Area_Name; - //a.AscriptionName = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).AscriptionName; - a.Logo = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Logo; - //a.Nhef = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Nhef; - //a.Rank = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Rank.ToString(); - //a.Sff = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Sff; - //a.Syl = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Syl; - //a.AreaName = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Area_Name; - //a.PlanIds =new List() { 12123, 1212, 1212 }; + Logo = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Logo, + UniversityId = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Id, + AreaName = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).Province, + UniversityCode = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).EnrollmentCode, + Rank = 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("双一流") ? "是" : "否") : "否", + SchoolScoreline = int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23SchoolScoreLine), + SchoolLowScore = int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23SchoolScore), + Type = MajorPlanScoreTool.GetPlanScore(int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23Score), (int)query.Score) == 2 ? "冲" : MajorPlanScoreTool.GetPlanScore(int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23Score), (int)query.Score) == 1 ? "稳" : "保",//冲稳保院校 + Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23Score), (int)query.Score), + AscriptionName = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).Ownership, + CityName = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).City, + MjaorPlan = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Count(), + planCount = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Sum(m => int.Parse(m._23Count)), + PlanIds = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Select(c => c.ID).ToList(), + UniversityName = s.UniversityName, - a.Type = (a.Scoreline <= chongfirst && a.Scoreline > chongend) ? "冲" : (a.Scoreline <= chongend && a.Scoreline > wenend) ? "稳" : "保"; - }); + }).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList(); return new MessageModel>() { @@ -230,11 +227,11 @@ namespace New_College.Repository msg = "获取成功", response = new PageModel() { - data = recommendInfo, - dataCount = recommendInfo.Count, + data = ulist, + dataCount = universitylist.Count, page = query.PageIndex, PageSize = query.PageSize, - pageCount = (int)Math.Ceiling(recommendInfo.Count / Convert.ToDecimal(query.PageSize)) + pageCount = (int)Math.Ceiling(universitylist.Count / Convert.ToDecimal(query.PageSize)) } }; } diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index 8476adc..dcbf5a6 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -18,6 +18,7 @@ using Org.BouncyCastle.Asn1.Ocsp; using SqlSugar; using System.Linq.Expressions; using static New_College.Services.T_EnrollmentPlaneServices; +using NPOI.SS.Formula.Functions; namespace New_College.Services { @@ -44,6 +45,7 @@ namespace New_College.Services private readonly ID_QualificationLineRepository _QualificationLineRepository; private readonly ID_ScoreLineRepository _ScoreLineRepository; private readonly IT_BatchlineRepository t_BatchlineRepository; + private readonly IT_TbSNeedDataInfoRepository t_TbSNeedDataInfoRepository; public T_EnrollmentPlanedescServices(IBaseRepository dal , ID_UniversityRepository ID_UniversityRepository , IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository @@ -60,7 +62,8 @@ namespace New_College.Services , ID_UniversityCollectionRepository ID_UniversityCollectionRepository , IT_GearInfoRepository IT_GearInfoRepository, IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescServices, IV_CustomerInfoRepository v_CustomerInfoRepository, ID_PlanMajorDescRepository planMajorDescRepository, - ID_PlanMajorScoreLineRepository planMajorScoreLineRepository, ID_QualificationLineRepository qualificationLineRepository, ID_ScoreLineRepository scoreLineRepository, IT_BatchlineRepository batchlineRepository) + ID_PlanMajorScoreLineRepository planMajorScoreLineRepository, ID_QualificationLineRepository qualificationLineRepository, ID_ScoreLineRepository scoreLineRepository, + IT_BatchlineRepository batchlineRepository, IT_TbSNeedDataInfoRepository tbSNeedDataInfoRepository) { this._dal = dal; d_UniversityRepository = ID_UniversityRepository; @@ -84,6 +87,7 @@ namespace New_College.Services _QualificationLineRepository = qualificationLineRepository; _ScoreLineRepository = scoreLineRepository; t_BatchlineRepository = batchlineRepository; + t_TbSNeedDataInfoRepository = tbSNeedDataInfoRepository; } public List permut = new List(); @@ -584,36 +588,47 @@ namespace New_College.Services /// public async Task>> GetPlanByUniversity(PlanDetailQuery query) { - if (query.PlanIds != null && query.PlanIds.Count <= 0) return new MessageModel>() { success = false, msg = "传入不能为空" }; - var info = await _PlanMajorDescRepository.QueryPage(x => x.IsDelete == false && query.PlanIds.Contains(x.Id), query.PageIndex, query.PageSize, "LowScore desc"); - int tpyear = info.data.FirstOrDefault().Years; + var info = await t_TbSNeedDataInfoRepository.QueryPage(x => SqlFunc.ContainsArray(query.PlanIds, x.ID), query.PageIndex, query.PageSize, "UniversityRank asc"); + // int tpyear = info.data.FirstOrDefault().Years; string tpname = info.data.FirstOrDefault().UniversityName; string location = info.data.FirstOrDefault().Location; - // var planmajorlist = await _PlanMajorDescRepository.Query(c => c.UniversityName == tpname && c.Years == tpyear - 1 && c.Location == location); List list = new List() { }; foreach (var item in info.data) { - var newname = item.Major; - var newmoney = string.IsNullOrWhiteSpace(item.Free) || item.Free == "0" || item.Free == "待定" ? "--" : item.Free; - // var newyear = string.IsNullOrWhiteSpace(item.AcademicYear) ? "--" : item.AcademicYear; - // var newyear = planmajorlist.FirstOrDefault().Years.ToString(); - // float scoreLine = planmajorlist.Where(c => c.UniversityName == item.UniversityName && c.Major == item.Major).Any() ? planmajorlist.Where(c => c.UniversityName == item.UniversityName && c.Major == item.Major).FirstOrDefault().LowScore : 0; - var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore); - if (count > 0) - continue; + var newname = item.MajorName; + var newmoney = string.IsNullOrWhiteSpace(item.Fee) || item.Fee == "0" || item.Fee == "待定" ? "--" : item.Fee; + //var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore); + //if (count > 0) + // continue; list.Add(new PlanDescList() { Name = newname, - Year = (item.Years - 1).ToString(), + Year = "2023", Money = newmoney, - PlanNum = item.PlanCount, - MajorId = item.Id, - Scoreline = item.LowScore, - Type = MajorPlanScoreTool.GetPlanScore(item.LowScore, query.Score),//还缺冲稳保 - Percentage = MajorPlanScoreTool.GetPlanPercentage(item.LowScore, query.Score), - //Subject = GetSub(item.Subjectclaim) + PlanNum = int.Parse(item._23Count), + MajorId = item.ID, + Scoreline = int.Parse(item._23ScoreLine), + Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保 + Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score), + Subject = item._23subject, + + planItems = new List() + { + new PlanItem() { + PlanCount=int.Parse(item._22Count), + RankLine=int.Parse(item._22ScoreLine), + Scoreline=int.Parse(item._22Score), + Year="2022" + }, + new PlanItem() { + PlanCount=int.Parse(item._21Count), + RankLine=int.Parse(item._21ScoreLine), + Scoreline=int.Parse(item._21Score), + Year="2021" + }, + } }); } return new MessageModel>() diff --git a/New_College.Services/V_CustomerInfoServices.cs b/New_College.Services/V_CustomerInfoServices.cs index 4321a73..9a85230 100644 --- a/New_College.Services/V_CustomerInfoServices.cs +++ b/New_College.Services/V_CustomerInfoServices.cs @@ -50,6 +50,14 @@ namespace New_College.Services var salt = RadomHelper.RandCode(6); info.UserPwd = MD5Helper.MD5Encrypt16(query.UserPwd + salt); } + + if (!string.IsNullOrWhiteSpace(query.UserCode)) + { + + info.UserCode =query.UserCode; + } + + var result = await _dal.Update(info); return new CustomerInfoResult() { @@ -179,6 +187,7 @@ namespace New_College.Services { info.ClassName = query.ClassName; } + var result = await _dal.Update(info); if (result) { @@ -233,6 +242,7 @@ namespace New_College.Services response = new CustomerInfoResult() { AvatarUrl = info.AvatarUrl, + UserCode = info.UserCode, Gender = info.Gender, Id = info.Id, OpenId = info.OpenId,