From 3ded833bc35c654910029a5fd64a7c4a07b4395f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Fri, 26 Jan 2024 16:31:30 +0800 Subject: [PATCH] bug fixed --- .../Back/D_PlanMajorDescController.cs | 30 +- .../Front/PcVolunteerController.cs | 78 ++-- .../Controllers/Front/WeixinPayController.cs | 5 +- New_College.Common/DistinctBy.cs | 25 + .../ID_PlanMajorDescServices.cs | 11 +- .../ViewModels/Query/OneSubmitGoRequest.cs | 7 + .../ViewModels/Query/OrderInfoQuery.cs | 4 +- .../ViewModels/Query/VolunteerTableQuery.cs | 2 +- .../ViewModels/Result/VolunteerResult.cs | 1 + .../ViewModels/Result/VolunteerTableResult.cs | 2 +- .../ViewModels/VolunteerTableDtoView.cs | 2 +- .../D_PlanMajorDescServices.cs | 442 ++++++++++-------- .../T_EnrollmentPlanedescServices.cs | 51 +- New_College.Services/V_OrderInfoServices.cs | 9 +- 14 files changed, 392 insertions(+), 277 deletions(-) create mode 100644 New_College.Common/DistinctBy.cs diff --git a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs index 38e5b77..a6d93a9 100644 --- a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs +++ b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs @@ -49,26 +49,22 @@ namespace New_College.Api.Controllers [HttpGet] public async Task> GetAIPerview([FromQuery] OneSubmitGoRequest request) { - var test = (await _VolunteerTableServices.Query()).FirstOrDefault(); - var pie = new List(); - pie.Add(new PieChatsDto() { name = "需冲刺", value = 560 }); - pie.Add(new PieChatsDto() { name = "较稳妥", value = 1301 }); - pie.Add(new PieChatsDto() { name = "可保底", value = 600 }); - var ulist = new List(); - ulist.Add(new UniversityPerviewDto() { Name = "985", Count = 7 }); - ulist.Add(new UniversityPerviewDto() { Name = "211", Count = 18 }); - ulist.Add(new UniversityPerviewDto() { Name = "双一流", Count = 56 }); - ulist.Add(new UniversityPerviewDto() { Name = "省重点", Count = 42 }); - ulist.Add(new UniversityPerviewDto() { Name = "公办", Count = 134 }); - ulist.Add(new UniversityPerviewDto() { Name = "民办", Count = 10 }); + var perviewdto = await _d_PlanMajorDescServices.GetAIPerview(request); + //var pie = new List(); + //pie.Add(new PieChatsDto() { name = "需冲刺", value = 560 }); + //pie.Add(new PieChatsDto() { name = "较稳妥", value = 1301 }); + //pie.Add(new PieChatsDto() { name = "可保底", value = 600 }); + //var ulist = new List(); + //ulist.Add(new UniversityPerviewDto() { Name = "985", Count = 7 }); + //ulist.Add(new UniversityPerviewDto() { Name = "211", Count = 18 }); + //ulist.Add(new UniversityPerviewDto() { Name = "双一流", Count = 56 }); + //ulist.Add(new UniversityPerviewDto() { Name = "省重点", Count = 42 }); + //ulist.Add(new UniversityPerviewDto() { Name = "公办", Count = 134 }); + //ulist.Add(new UniversityPerviewDto() { Name = "民办", Count = 10 }); return new MessageModel() { msg = "ok", - response = new AIPerviewDto() - { - pieChats = pie, - universities = ulist - }, + response = perviewdto, success = true }; } diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index ada98ec..6c8e063 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -17,6 +17,7 @@ using New_College.Common; using Microsoft.AspNetCore.Authorization; using StackExchange.Profiling.Internal; using Newtonsoft.Json; +using NPOI.SS.Formula.Functions; namespace New_College.Api.Controllers.Front { @@ -31,15 +32,13 @@ namespace New_College.Api.Controllers.Front private readonly IU_VolunteerTableServices _VolunteerTableServices; private readonly IU_VolunteerTableDetailServices _VolunteerTableDetailServices; private readonly IUnitOfWork _unitOfWork; - private readonly ID_PlanMajorDescServices _planMajorDescServices; private readonly IT_TbSNeedDataInfoServices _TbSNeedDataInfoServices; - public PcVolunteerController(IU_VolunteerTableServices volunteerTableServices, IU_VolunteerTableDetailServices volunteerTableDetailServices, - IUnitOfWork unitOfWork, ID_PlanMajorDescServices planMajorDescServices, IT_TbSNeedDataInfoServices tbSNeedDataInfoServices) + public PcVolunteerController(IU_VolunteerTableServices volunteerTableServices, IU_VolunteerTableDetailServices volunteerTableDetailServices, + IUnitOfWork unitOfWork, IT_TbSNeedDataInfoServices tbSNeedDataInfoServices) { _VolunteerTableServices = volunteerTableServices; _VolunteerTableDetailServices = volunteerTableDetailServices; _unitOfWork = unitOfWork; - _planMajorDescServices = planMajorDescServices; _TbSNeedDataInfoServices = tbSNeedDataInfoServices; } @@ -118,11 +117,11 @@ namespace New_College.Api.Controllers.Front var ids = item.PlanMajorIds.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(c => int.Parse(c)).ToList(); PlanMajorIds.AddRange(ids); } - var planmajordesc = await _planMajorDescServices.Query(c => SqlFunc.ContainsArray(PlanMajorIds, c.Id));// + var planmajordesc = await _TbSNeedDataInfoServices.Query(c => SqlFunc.ContainsArray(PlanMajorIds, c.ID));// var location = planmajordesc.FirstOrDefault().Location; - var majorlist = planmajordesc.Select(c => c.Major).ToList(); + var majorlist = planmajordesc.Select(c => c.MajorName).ToList(); var universityname = planmajordesc.Select(c => c.UniversityName).Distinct().ToList(); - var planmajorcomplist = await _planMajorDescServices.Query(c => c.Location == location && SqlFunc.ContainsArray(majorlist, c.Major) && SqlFunc.ContainsArray(universityname, c.UniversityName));// + var planmajorcomplist = await _TbSNeedDataInfoServices.Query(c => c.Location == location && SqlFunc.ContainsArray(majorlist, c.MajorName) && SqlFunc.ContainsArray(universityname, c.UniversityName));// view.VolunteerTableName = query.VolunteerTableName; view.SubjectClaim = query.SubjectClaim; @@ -136,7 +135,7 @@ namespace New_College.Api.Controllers.Front items.ForEach(s => { - var planids = s.PlanMajorIds.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(ss => int.Parse(ss)).ToList(); + var planids = s.PlanMajorIds.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(ss => long.Parse(ss)).ToList(); var typeinfo = new List(); if (!string.IsNullOrWhiteSpace(s.VolunteerRemark)) { @@ -144,36 +143,45 @@ namespace New_College.Api.Controllers.Front } var uitem = new VolunteerTableDetailItemsView() { - // Sort = s.Sort, - planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.Id)).Select(c => new VolunteerTablePlanMajorItem() - { - fee = c.Free, - Major = c.Major, - MajorCode = c.MajorCode, - MajorGroup = c.MajorGroup, - MajorRemark = c.Remark, - planCount = c.PlanCount, - PlanId = c.Id, - Sort = s.OrderSort, - SubjectClam = c.SelectSubject, - Percentage = typeinfo.Any() && typeinfo.Count() > 0 ? typeinfo.FirstOrDefault(d => d.planId == c.Id).tage : 0, - Type = typeinfo.Any() && typeinfo.Count() > 0 ? typeinfo.FirstOrDefault(d => d.planId == c.Id).type : 0, - PlanItems = planmajorcomplist.Where(ee => ee.UId == s.UniversityId && ee.Major == c.Major && ee.MajorCode == c.MajorCode).Select(tt => new PlanItem() - { - Count = (tt.PlanCount == 0 ? "--" : tt.PlanCount.ToString()), - PlanCount = tt.PlanCount, - RankLine = tt.LowScoreRank, - Scoreline = tt.LowScore, - Year = tt.Years.ToString() - }).ToList() - }).ToList(), - UniversityId = s.UniversityId, + + // UniversityId = s.UniversityId, UniversityName = s.UniversityName, UniversityCode = s.UniversityCode, Sort = s.OrderSort, - _211 = planmajordesc.Where(e => e.UId == s.UniversityId).FirstOrDefault()._211, - _985 = planmajordesc.Where(e => e.UId == s.UniversityId).FirstOrDefault()._985, - _SYL = planmajordesc.Where(e => e.UId == s.UniversityId).FirstOrDefault()._SYL, + UniversityId = s.UniversityId, + _211 = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("211") ? "是" : "否" : "否", + _985 = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("985") ? "是" : "否" : "否", + _SYL = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("双一流") ? "是" : "否" : "否", + planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem() + { + + fee = c.Fee, + Major = c.MajorName, + MajorCode = c.MajorCode, + // MajorGroup = c.MajorGroup, + MajorRemark = c.Remark, + planCount = int.Parse(c._23Count), + PlanId = c.ID, + Sort = s.OrderSort, + SubjectClam = c._23subject, + Percentage = typeinfo.Any() && typeinfo.Count() > 0 ? typeinfo.FirstOrDefault(d => d.planId == c.ID).tage : 0, + Type = typeinfo.Any() && typeinfo.Count() > 0 ? typeinfo.FirstOrDefault(d => d.planId == c.ID).type : 0, + PlanItems = new List() + { + + new PlanItem() { + PlanCount=int.Parse(c._22Count), + RankLine=int.Parse(c._22ScoreLine), + Scoreline=int.Parse(c._22Score), + Year="2022" + }, + new PlanItem() { + PlanCount=int.Parse(c._21Count), + RankLine=int.Parse(c._21ScoreLine), + Scoreline=int.Parse(c._21Score), + Year="2021" + } } + }).ToList() }; tableDetailItemsViews.Add(uitem); diff --git a/New_College.Api/Controllers/Front/WeixinPayController.cs b/New_College.Api/Controllers/Front/WeixinPayController.cs index 0197211..660fdc9 100644 --- a/New_College.Api/Controllers/Front/WeixinPayController.cs +++ b/New_College.Api/Controllers/Front/WeixinPayController.cs @@ -252,7 +252,7 @@ namespace New_College.Api.Controllers.Front var decryptModel = JsonConvert.DeserializeObject(decryptStr); var viewModel = new WxPayCallbackViewModel(); - if (decryptModel != null&&decryptModel.trade_state== "SUCCESS") + if (decryptModel != null && decryptModel.trade_state == "SUCCESS") { DingHookHelper.DingTalkHookMessage("PayNotify-decryptModel", decryptModel.ToJson()); var info = await v_OrderInfoRepository.Query(x => x.out_trade_no == decryptModel.out_trade_no); @@ -265,6 +265,7 @@ namespace New_College.Api.Controllers.Front } var oneinfo = info.FirstOrDefault(); oneinfo.Status = EnumOrderType.payoff; + oneinfo.ModifyTime = DateTime.Now; var rep = await v_OrderInfoRepository.Update(oneinfo); if (rep) { @@ -302,7 +303,7 @@ namespace New_College.Api.Controllers.Front } - + } diff --git a/New_College.Common/DistinctBy.cs b/New_College.Common/DistinctBy.cs new file mode 100644 index 0000000..dd12251 --- /dev/null +++ b/New_College.Common/DistinctBy.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace New_College +{ + public static class DistinctByHelper + { + + public static IEnumerable DistinctBy(this IEnumerable source, Func keySelector) + { + HashSet seenKeys = new HashSet(); + foreach (var item in source) + { + if (seenKeys.Add(keySelector(item))) + { + yield return item; + } + } + } + + } +} diff --git a/New_College.IServices/ID_PlanMajorDescServices.cs b/New_College.IServices/ID_PlanMajorDescServices.cs index 524a7ff..8eb7d57 100644 --- a/New_College.IServices/ID_PlanMajorDescServices.cs +++ b/New_College.IServices/ID_PlanMajorDescServices.cs @@ -1,4 +1,5 @@ -using New_College.IServices.BASE; +using Microsoft.AspNetCore.Mvc; +using New_College.IServices.BASE; using New_College.Model; using New_College.Model.Models; using New_College.Model.ViewModels; @@ -34,5 +35,13 @@ namespace New_College.IServices /// /// Task> GetAIGoList(OneSubmitGoRequest request); + + + /// + /// 院校预览 + /// + /// + /// + Task GetAIPerview(OneSubmitGoRequest request); } } \ No newline at end of file diff --git a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs index 97815eb..95bf075 100644 --- a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs +++ b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs @@ -7,7 +7,14 @@ namespace New_College.Model.ViewModels { + public class AIPerviewItemDto + { + public string UniversityName { get; set; } + public int Type { get; set; } + public string LnstitutionalLevel { get; set; } + public string Nature { get; set; } + } /// diff --git a/New_College.Model/ViewModels/Query/OrderInfoQuery.cs b/New_College.Model/ViewModels/Query/OrderInfoQuery.cs index 4f25467..7f41bcc 100644 --- a/New_College.Model/ViewModels/Query/OrderInfoQuery.cs +++ b/New_College.Model/ViewModels/Query/OrderInfoQuery.cs @@ -98,6 +98,8 @@ namespace New_College.Model.ViewModels /// public DateTime CreateTime { get; set; } + public DateTime PayTime { get; set; } + } public class SearchOrderQuery : BasePageRequest @@ -154,7 +156,7 @@ namespace New_College.Model.ViewModels /// /// 根据支付方式查询 /// - public int? PayType { get; set; } + public int? PayType { get; set; } /// /// 根据支付状态查询 diff --git a/New_College.Model/ViewModels/Query/VolunteerTableQuery.cs b/New_College.Model/ViewModels/Query/VolunteerTableQuery.cs index ec3d317..11b2a58 100644 --- a/New_College.Model/ViewModels/Query/VolunteerTableQuery.cs +++ b/New_College.Model/ViewModels/Query/VolunteerTableQuery.cs @@ -18,7 +18,7 @@ namespace New_College.Model.ViewModels public string UniversityName { get; set; } - public List PlanMagorIds { get; set; } + public List PlanMagorIds { get; set; } } public class HollandVolunteerTableQuery diff --git a/New_College.Model/ViewModels/Result/VolunteerResult.cs b/New_College.Model/ViewModels/Result/VolunteerResult.cs index 59fd356..bbbf64d 100644 --- a/New_College.Model/ViewModels/Result/VolunteerResult.cs +++ b/New_College.Model/ViewModels/Result/VolunteerResult.cs @@ -164,6 +164,7 @@ namespace New_College.Model.ViewModels public long MajorId { get; set; } public float Scoreline { get; set; } + public string AcademicYear { get; set; } /// /// 冲稳保类型 /// diff --git a/New_College.Model/ViewModels/Result/VolunteerTableResult.cs b/New_College.Model/ViewModels/Result/VolunteerTableResult.cs index edbb750..8b97cd3 100644 --- a/New_College.Model/ViewModels/Result/VolunteerTableResult.cs +++ b/New_College.Model/ViewModels/Result/VolunteerTableResult.cs @@ -72,7 +72,7 @@ namespace New_College.Model.ViewModels /// public string MajorGroup { get; set; } public string MajorCode { get; set; } - public int MajorId { get; set; } + public long MajorId { get; set; } public string PlanName { get; set; } diff --git a/New_College.Model/ViewModels/VolunteerTableDtoView.cs b/New_College.Model/ViewModels/VolunteerTableDtoView.cs index 9f1ac47..ec4e48e 100644 --- a/New_College.Model/ViewModels/VolunteerTableDtoView.cs +++ b/New_College.Model/ViewModels/VolunteerTableDtoView.cs @@ -149,7 +149,7 @@ namespace New_College.Model.ViewModels /// /// 招生计划Id /// - public int PlanId { get; set; } + public long PlanId { get; set; } } diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index c5b5ef4..de1c8dd 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -56,107 +56,184 @@ namespace New_College.Services return await _planMajorDescRepository.Batchupdate(majorDescs); } - - /// - /// - /// - /// - /// - public async Task> GetAIGoList(OneSubmitGoRequest request) + public async Task GetAIPerview(OneSubmitGoRequest request) { - request.PageSize = request.PageSize > 50 ? 50 : request.PageSize; - var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - var pagemodel = new AIGOPageModel(); - int startscore = request.Score - 15; + var aidto = new AIPerviewDto(); + int startscore = request.Score - 25; int endscore = request.Score + 15; - int qyear = request.Year >= 2023 ? 2023 : request.Year; - var batlist = await _batchlineRepository.Query(c => c.Year == request.Year && c.Type_name == "综合"); - 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) - .And(c => c.Location == request.Location) - .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName)) - .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.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 == "是") - .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) - .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) - .ToExpression(); - //var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); - var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); + var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - //var majorarry = query.data.Select(c => c.Major).Distinct().ToArray(); - var universityarry = query.data.Select(c => c.UniversityName).Distinct().ToArray();// - - Expression> expression3 = Expressionable.Create() - .And(c => c.Location == request.Location) + Expression> expression = Expressionable.Create() + .And(c => c.Location == request.Location) .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 == "不限") - //.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) - // .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType) .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")) .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) - .AndIF(universityarry.Any(), c => SqlFunc.ContainsArray(universityarry, c.UniversityName)) .AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c._23Score, request.StartScore, request.EndScore)) .ToExpression(); - var querylist = await this.sNeedDataInfoServices.Query(expression3); - - var responselist = query.data.Select(c => new AIGOResponse() + var querylist = await sNeedDataInfoServices.Query(expression); + var unlist = querylist.GroupBy(b => b.UniversityName).Select(c => new AIPerviewItemDto() { UniversityName = c.Key }).ToList(); + var mapunlist = unlist.Select(c => new AIPerviewItemDto { - AreaName = c.AreaName, - Rank = c.Rank > 9999 ? "--" : c.Rank.ToString(), - _985 = c._985, - _211 = c._211, - _SYL = c._SYL, - UniversityId = c.UId, - UniversityName = c.UniversityName, - UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.RecruitCode.ToString()), - collegeCode = c.RecruitCode.ToString(), - LowScoreRank = c.LowScoreRank, - Ownership = c.Ownership, - Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//冲稳保院校 - Percentage = MajorPlanScoreTool.GetPlanPercentage(c.LowScore, request.Score), - planCount = querylist.Where(w => w.UniversityName == c.UniversityName).Sum(c => int.Parse(c._23Count)), - }).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).ToList(); - - responselist.ToList().ForEach(c => + LnstitutionalLevel = querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault().LnstitutionalLevel, + Nature = querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault().Nature, + UniversityName = querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault().UniversityName, + Type = MajorPlanScoreTool.GetPlanScore(int.Parse(querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault()._23Score), request.Score), + }).ToList(); + aidto.universities = new List() { - var items = querylist.Where(e => e.UniversityName == c.UniversityName); - c._fcount = items.Select(e => int.Parse(e._23Count)).Sum(); - c._scount = items.Select(e => int.Parse(e._22Count)).Sum(); - c._tcount = items.Select(e => int.Parse(e._21Count)).Sum(); - c._fscore = items.Min(e => int.Parse(e._23SchoolScore)); - c._frank = items.Min(e => int.Parse(e._23SchoolScoreLine)); - c._sscore = items.Min(e => int.Parse(e._22Score)); - c._srank = items.Min(e => int.Parse(e._22ScoreLine)); - c._tscore = items.Min(e => int.Parse(e._22Score)); - c._trank = items.Min(e => int.Parse(e._22ScoreLine)); - c.iGoPlanMajorItems = items.Select(t => new AIGoPlanMajorItem() + new UniversityPerviewDto() + { + Name="985", + Count=mapunlist.Where(e=>e.LnstitutionalLevel!=null&&e.LnstitutionalLevel.Contains("985")).Count(), + }, + new UniversityPerviewDto() + { + Name="211", + Count=mapunlist.Where(e=>e.LnstitutionalLevel!=null&&e.LnstitutionalLevel.Contains("211")).Count(), + }, + new UniversityPerviewDto() + { + Name="双一流", + Count=mapunlist.Where(e=>e.LnstitutionalLevel!=null&&e.LnstitutionalLevel.Contains("双一流")).Count(), + }, + new UniversityPerviewDto() { + Name="保研资格", + Count=mapunlist.Where(e=>e.LnstitutionalLevel!=null&&e.LnstitutionalLevel.Contains("保研资格")).Count(), + }, + new UniversityPerviewDto() { + Name="公办", + Count=mapunlist.Where(e=>e.Nature=="公办").Count(), + }, + new UniversityPerviewDto() { + Name="民办", + Count=mapunlist.Where(e=>e.Nature=="民办").Count(), + }, + }; + aidto.pieChats = new List() + { + + new PieChatsDto() { + name="需冲刺", + value=mapunlist.Where(e=>e.Type==2).Count() + }, + new PieChatsDto() { + name="较稳妥", + value=mapunlist.Where(e=>e.Type==1).Count() + }, + new PieChatsDto() { + name="可保底", + value=mapunlist.Where(e=>e.Type==0).Count() + }, + + }; + return aidto; + } + + /// + /// + /// + /// + /// + public async Task> GetAIGoList(OneSubmitGoRequest request) + { + request.PageSize = request.PageSize > 50 ? 50 : request.PageSize; + var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); + var pagemodel = new AIGOPageModel(); + int startscore = request.Score - 25; + int endscore = request.Score + 15; + int qyear = request.Year >= 2023 ? 2023 : request.Year; + var batlist = await _batchlineRepository.Query(c => c.Year == request.Year && c.Type_name == "综合"); + 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) + .And(c => c.Location == request.Location) + .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName)) + .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.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 == "是") + .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) + .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) + .ToExpression(); + //var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); + var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); + + //var majorarry = query.data.Select(c => c.Major).Distinct().ToArray(); + var universityarry = query.data.Select(c => c.UniversityName).Distinct().ToArray();// + + Expression> expression3 = Expressionable.Create() + .And(c => c.Location == request.Location) + .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 == "不限") + //.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName) + .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) + // .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType) + .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")) + .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) + .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) + .AndIF(universityarry.Any(), c => SqlFunc.ContainsArray(universityarry, c.UniversityName)) + .AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c._23Score, request.StartScore, request.EndScore)) + .ToExpression(); + var querylist = await this.sNeedDataInfoServices.Query(expression3); + + var responselist = query.data.Select(c => new AIGOResponse() + { + AreaName = c.AreaName, + Rank = c.Rank > 9999 ? "--" : c.Rank.ToString(), + _985 = c._985, + _211 = c._211, + _SYL = c._SYL, + UniversityId = c.UId, + UniversityName = c.UniversityName, + UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.RecruitCode.ToString()), + collegeCode = c.RecruitCode.ToString(), + LowScoreRank = c.LowScoreRank, + Ownership = c.Ownership, + Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//冲稳保院校 + Percentage = MajorPlanScoreTool.GetPlanPercentage(c.LowScore, request.Score), + planCount = querylist.Where(w => w.UniversityName == c.UniversityName).Sum(c => int.Parse(c._23Count)), + }).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).ToList(); + + responselist.ToList().ForEach(c => + { + var items = querylist.Where(e => e.UniversityName == c.UniversityName); + c._fcount = items.Select(e => int.Parse(e._23Count)).Sum(); + c._scount = items.Select(e => int.Parse(e._22Count)).Sum(); + c._tcount = items.Select(e => int.Parse(e._21Count)).Sum(); + c._fscore = items.Min(e => int.Parse(e._23SchoolScore)); + c._frank = items.Min(e => int.Parse(e._23SchoolScoreLine)); + c._sscore = items.Min(e => int.Parse(e._22Score)); + c._srank = items.Min(e => int.Parse(e._22ScoreLine)); + c._tscore = items.Min(e => int.Parse(e._22Score)); + c._trank = items.Min(e => int.Parse(e._22ScoreLine)); + c.iGoPlanMajorItems = items.Select(t => new AIGoPlanMajorItem() + { + + PlanId = t.ID, + MajorCode = t.MajorCode, + fee = t.Fee, + Major = t.MajorName, + // MajorGroup = t.MajorGroup,//山东无专业组 + MajorRemark = t.Remark, + planCount = int.Parse(t._23Count), + SubjectClam = t._23subject, + Type = MajorPlanScoreTool.GetPlanScore(int.Parse(t._23Score), request.Score),//冲稳保院校 + Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(t._23Score), request.Score), + PlanItems = new List() { - - PlanId = t.ID, - MajorCode = t.MajorCode, - fee = t.Fee, - Major = t.MajorName, - // MajorGroup = t.MajorGroup,//山东无专业组 - MajorRemark = t.Remark, - planCount = int.Parse(t._23Count), - SubjectClam = t._23subject, - Type = MajorPlanScoreTool.GetPlanScore(int.Parse(t._23Score), request.Score),//冲稳保院校 - Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(t._23Score), request.Score), - PlanItems = new List() - { new PlanItem() { PlanCount=int.Parse(t._23Count), RankLine=int.Parse(t._23ScoreLine), @@ -175,93 +252,94 @@ namespace New_College.Services Scoreline=int.Parse(t._21Score), Year="2021" }, - } - }).ToList(); + } + }).ToList(); - }); - return new AIGOPageModel() - { - data = responselist, - c = responselist.Where(c => c.Type == 2).Count(), - w = responselist.Where(c => c.Type == 1).Count(), - b = responselist.Where(c => c.Type == 0).Count(), - dataCount = query.dataCount, - page = query.page, - pageCount = query.pageCount, - PageSize = query.PageSize - }; - } + }); + return new AIGOPageModel() + { + data = responselist, + c = responselist.Where(c => c.Type == 2).Count(), + w = responselist.Where(c => c.Type == 1).Count(), + b = responselist.Where(c => c.Type == 0).Count(), + dataCount = query.dataCount, + page = query.page, + pageCount = query.pageCount, + PageSize = query.PageSize + }; + } - /// - /// 一键填报招生计划展示 - /// - /// - /// - public async Task> GetPlanMajorList(OneSubmitGoRequest request) + + /// + /// 一键填报招生计划展示 + /// + /// + /// + public async Task> GetPlanMajorList(OneSubmitGoRequest request) + { + + var pagemodel = new PageModel(); + + request.PageSize = request.PageSize < 100 ? 100 : request.PageSize; + //request.PageSize = 150;//山东省 + + request.Year = request.Year > 2023 ? 2023 : request.Year; + var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); + Expression> expression3 = Expressionable.Create() + + .And(c => c.Location == request.Location) + .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 == "不限") + .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major)) + //.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName)) + .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) + //.And(c => c.Years == request.Year) + //.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType) + .AndIF(request.Score > 0, c => SqlFunc.Between(c._23Score, request.Score - 25, request.Score + 15)) + .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")) + .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) + .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) + //.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间 + .ToExpression(); + + var querylist = await this.sNeedDataInfoServices.Query(expression3); + + var universitymaps = (await _UniversityServices.Query(c => c.IsDelete == false)).Select(c => new D_University() + { + Id = c.Id, + Name = c.Name, + }).ToList(); + + var responselist = querylist.Select(c => new OneSubmitGoResponse() { - var pagemodel = new PageModel(); - - request.PageSize = request.PageSize < 100 ? 100 : request.PageSize; - //request.PageSize = 150;//山东省 - - request.Year = request.Year > 2023 ? 2023 : request.Year; - var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - Expression> expression3 = Expressionable.Create() - - .And(c => c.Location == request.Location) - .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 == "不限") - .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major)) - //.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName)) - .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) - //.And(c => c.Years == request.Year) - //.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType) - .AndIF(request.Score > 0, c => SqlFunc.Between(c._23Score, request.Score - 25, request.Score + 15)) - .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")) - .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) - .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) - //.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间 - .ToExpression(); - - var querylist = await this.sNeedDataInfoServices.Query(expression3); - - var universitymaps = (await _UniversityServices.Query(c => c.IsDelete == false)).Select(c => new D_University() - { - Id = c.Id, - Name = c.Name, - }).ToList(); - - var responselist = querylist.Select(c => new OneSubmitGoResponse() - { - - AreaName = c.Province, - fee = c.Fee, - Major = c.MajorName, - // MajorGroup = c.MajorGroup, - AcademicYear = c.AcademicYear, - MajorRemark = c.Remark, - planCount = int.Parse(c._23Count), - Ownership = c.Ownership, - Rank = c.UniversityRank, - _985 = c.LnstitutionalLevel!=null?(c.LnstitutionalLevel.Contains("985") ? "是" : "否") : "否", - _211 = c.LnstitutionalLevel != null ? (c.LnstitutionalLevel.Contains("211") ? "是" : "否") : "否", - _SYL = c.LnstitutionalLevel != null ? (c.LnstitutionalLevel.Contains("双一流") ? "是" : "否"): "否", - UniversityId = universitymaps.Where(e => e.Name == c.UniversityName).Any() ? universitymaps.FirstOrDefault(e => e.Name == c.UniversityName).Id : 0, - UniversityName = c.UniversityName, - SubjectClam = c._23subject, - Type = MajorPlanScoreTool.GetPlanScore(int.Parse(c._23Score), request.Score),//还缺冲稳保 - Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(c._23Score), request.Score), - PlanId = (int)c.ID, - UniversityCode = c.EnrollmentCode, - collegeCode = c.EnrollmentCode, - MajorCode = c.MajorCode, - LowScoreRank = int.Parse(c._23SchoolScoreLine), - LowScore = int.Parse(c._23SchoolScore), - PlanItems = new List() + AreaName = c.Province, + fee = c.Fee, + Major = c.MajorName, + // MajorGroup = c.MajorGroup, + AcademicYear = c.AcademicYear, + MajorRemark = c.Remark, + planCount = int.Parse(c._23Count), + Ownership = c.Ownership, + Rank = c.UniversityRank, + _985 = c.LnstitutionalLevel != null ? (c.LnstitutionalLevel.Contains("985") ? "是" : "否") : "否", + _211 = c.LnstitutionalLevel != null ? (c.LnstitutionalLevel.Contains("211") ? "是" : "否") : "否", + _SYL = c.LnstitutionalLevel != null ? (c.LnstitutionalLevel.Contains("双一流") ? "是" : "否") : "否", + UniversityId = universitymaps.Where(e => e.Name == c.UniversityName).Any() ? universitymaps.FirstOrDefault(e => e.Name == c.UniversityName).Id : 0, + UniversityName = c.UniversityName, + SubjectClam = c._23subject, + Type = MajorPlanScoreTool.GetPlanScore(int.Parse(c._23Score), request.Score),//还缺冲稳保 + Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(c._23Score), request.Score), + PlanId = (int)c.ID, + UniversityCode = c.EnrollmentCode, + collegeCode = c.EnrollmentCode, + MajorCode = c.MajorCode, + LowScoreRank = int.Parse(c._23SchoolScoreLine), + LowScore = int.Parse(c._23SchoolScore), + PlanItems = new List() { new PlanItem() { PlanCount=int.Parse(c._23Count), @@ -282,21 +360,21 @@ namespace New_College.Services Year="2021" }, } - }).ToList(); - ////冲稳保比例--待定 - var newlist = responselist.Where(c => c.Type == 2).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(25).ToList(); - newlist.AddRange(responselist.Where(c => c.Type == 1).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(45).ToList()); - newlist.AddRange(responselist.Where(c => c.Type == 0).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(30).ToList()); - pagemodel.page = request.PageIndex; - pagemodel.data = newlist; - pagemodel.dataCount = responselist.Count; - pagemodel.PageSize = request.PageSize; - pagemodel.pageCount= pagemodel.data.Count(); - return pagemodel; - } - - - - + }).ToList(); + ////冲稳保比例--待定 + var newlist = responselist.Where(c => c.Type == 2).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(25).ToList(); + newlist.AddRange(responselist.Where(c => c.Type == 1).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(45).ToList()); + newlist.AddRange(responselist.Where(c => c.Type == 0).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(30).ToList()); + pagemodel.page = request.PageIndex; + pagemodel.data = newlist; + pagemodel.dataCount = responselist.Count; + pagemodel.PageSize = request.PageSize; + pagemodel.pageCount = pagemodel.data.Count(); + return pagemodel; } + + + + +} } \ No newline at end of file diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index dcbf5a6..1ac1d5c 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -613,7 +613,7 @@ namespace New_College.Services Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保 Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score), Subject = item._23subject, - + AcademicYear = item.AcademicYear, planItems = new List() { new PlanItem() { @@ -1203,13 +1203,13 @@ namespace New_College.Services /// public async Task>> GetAutoVolunteerTableDetail(VolunteerTableQuery query) { - + string yearName = "2023"; if (query.details == null) return new MessageModel>() { success = false, msg = "选择专业院校为空..." }; List list = new List() { }; //var planstringids = query.details.Select(x => x.PlanMagorIds).ToList(); - List PlanIds = new List() { }; - var id = 0; + var PlanIds = new List() { }; + long id = 0; foreach (var item in query.details) { if (item.PlanMagorIds != null && item.PlanMagorIds.Count() > 0) @@ -1218,26 +1218,15 @@ namespace New_College.Services id = item.PlanMagorIds.First(); } } - //string yearName = string.Empty; - //var plandescmodels = await this._PlanMajorDescRepository.QueryById(id); - //if (plandescmodels != null) - //{ - // var planinfo = await this.t_EnrollmentPlaneRepository.QueryById(plandescmodels.PlanId); - // if (planinfo != null) - // yearName = planinfo.Years.ToString(); - //} - - var descinfo = await _PlanMajorDescRepository.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id)); - string yearName = (descinfo.FirstOrDefault().Years - 1).ToString(); + var descinfo = await t_TbSNeedDataInfoRepository.Query(x => PlanIds.Contains(x.ID)); var universityids = query.details.Select(x => x.UniversityId).ToList(); - var universityinfo = await d_UniversityRepository.Query(x => universityids.Contains(x.Id) && x.IsDelete == false, "Rank asc"); foreach (var item in query.details) { if (item.PlanMagorIds != null && item.PlanMagorIds.Count() > 0) { - var nowdesc = descinfo.Where(x => item.PlanMagorIds.Contains(x.Id)).ToList(); + var nowdesc = descinfo.Where(x => item.PlanMagorIds.Contains(x.ID)).ToList(); if (nowdesc.Count <= 0) continue; var nowuniversityinfo = universityinfo.Where(x => x.Id == item.UniversityId).FirstOrDefault(); @@ -1249,13 +1238,13 @@ namespace New_College.Services { var newinfos = nowdesc.Select(x => new PlanInfo() { - MajorId = x.Id, - Money = x.Free, + MajorId = x.ID, + Money = x.Fee, Year = x.AcademicYear, - PlanName = x.Major, - PlanNum = x.PlanCount, - Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(), - LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString() + PlanName = x.MajorName, + PlanNum = int.Parse(x._23Count), + Scoreline = x._23Score == "0" ? "-" : x._23Score, + LowScoreRank = x._23ScoreLine == "0" ? "-" : x._23ScoreLine }).ToList(); count.FirstOrDefault().Infos.AddRange(newinfos); } @@ -1275,16 +1264,16 @@ namespace New_College.Services Nature = nowuniversityinfo.Nature, Infos = nowdesc.Select(x => new PlanInfo() { - MajorId = x.Id, - Money = x.Free, + MajorId = x.ID, + Money = x.Fee, Year = x.AcademicYear, - PlanName = x.Major, - PlanNum = x.PlanCount, - Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(), - LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString(), + PlanName = x.MajorName, + PlanNum = int.Parse(x._23Count), + Scoreline = x._23Score == "0" ? "-" : x._23Score, + LowScoreRank = x._23ScoreLine == " 0" ? "-" : x._23ScoreLine, YearName = yearName, - Type = query.Score.HasValue ? MajorPlanScoreTool.GetPlanScore(x.LowScore, query.Score.Value) : 0,//还缺冲稳保 - Percentage = query.Score.HasValue ? MajorPlanScoreTool.GetPlanPercentage(x.LowScore, query.Score.Value) : 0, + Type = query.Score.HasValue ? MajorPlanScoreTool.GetPlanScore(int.Parse(x._23Score), query.Score.Value) : 0,//还缺冲稳保 + Percentage = query.Score.HasValue ? MajorPlanScoreTool.GetPlanPercentage(int.Parse(x._23Score), query.Score.Value) : 0, }).ToList() }); } diff --git a/New_College.Services/V_OrderInfoServices.cs b/New_College.Services/V_OrderInfoServices.cs index 1860c9a..b1c9e2e 100644 --- a/New_College.Services/V_OrderInfoServices.cs +++ b/New_College.Services/V_OrderInfoServices.cs @@ -284,14 +284,12 @@ namespace New_College.Services }; } - var payType = query.PayType.HasValue ? (EnumPayType)query.PayType.Value : 0; - var payStatus = query.Status.HasValue ? (EnumOrderType)query.Status.Value : 0; Expression> wheres = Expressionable.Create() .And(x => x.IsDelete == false) .And(x => x.CustomerId == query.CustomerId) .AndIF(!string.IsNullOrWhiteSpace(query.CardNo), x => x.CardNo.Contains(query.CardNo))//根据卡号查询 - .And(x => x.Status == payStatus) //根据支付状态查询 - .And(x => x.PayType == payType) + .AndIF(query.Status.HasValue, x => x.Status == (EnumOrderType)query.Status.Value) //根据支付状态查询 + .AndIF(query.PayType.HasValue, x => x.PayType == (EnumPayType)query.PayType.Value) .AndIF(!string.IsNullOrWhiteSpace(query.out_trade_no), x => x.out_trade_no.Contains(query.out_trade_no)) .AndIF(query.CardTypeId > 0, x => x.CardTypeId == query.CardTypeId) //根据卡片类别查询 .ToExpression(); @@ -319,7 +317,8 @@ namespace New_College.Services out_trade_no = item.out_trade_no, //支付方式 PayTypeName = item.PayType.GetDescription(), - CreateTime = item.CreateTime.Value + CreateTime = item.CreateTime.Value, + PayTime = item.ModifyTime.Value, }); } pageModel.data = list;