From fdb24fe54a9959b3bfa29e8d37415ce488b7c410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Wed, 20 Mar 2024 14:59:50 +0800 Subject: [PATCH] bug fixed --- .../Controllers/Front/CustomerController.cs | 6 +----- .../Front/PcVolunteerController.cs | 20 ++++++++++--------- .../BASE/T_EnrollmentPlanedescRepository.cs | 7 +++---- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/New_College.Api/Controllers/Front/CustomerController.cs b/New_College.Api/Controllers/Front/CustomerController.cs index d6b00c0..c9cf80f 100644 --- a/New_College.Api/Controllers/Front/CustomerController.cs +++ b/New_College.Api/Controllers/Front/CustomerController.cs @@ -386,11 +386,7 @@ namespace New_College.Api.Controllers.Front { if (query.Score != customersingle.Expectedscore) { - Task.Run(async () => - { - await _userSetting.UpdateSingleCustomerSetting(new UserBaseSettingUpdateDTO() { UType = 0, CustomerId = query.StudentId });//修改参数次数 - - }); + await _userSetting.UpdateSingleCustomerSetting(new UserBaseSettingUpdateDTO() { UType = 0, CustomerId = query.StudentId });//修改参数次数 } var token = JwtHelper.IssueJwt(new TokenModelJwt() { Uid = result.Id, Role = "学生" }); result.Token = token; diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 35b773d..c917206 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -124,7 +124,7 @@ namespace New_College.Api.Controllers.Front 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; + view.SubjectClaim = query.SubjectClaim.Length > 2 ? "综合" : query.SubjectClaim; view.CustomerId = query.CustomerId; view.Score = query.Score; view.Type = query.Type; @@ -148,17 +148,19 @@ namespace New_College.Api.Controllers.Front UniversityCode = s.UniversityCode, Sort = s.OrderSort, 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("双一流") ? "是" : "否" : "否", - Ownership = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("省") ? "省属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("市") ? "市属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership, - AreaName = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Province + "|" + planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().City, - Nature = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Nature, - Rank = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().UniversityRank, + _211 = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("211") ? "是" : "否" : "否" : "否", + _985 = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("985") ? "是" : "否" : "否" : "否", + _SYL = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("双一流") ? "是" : "否" : "否" : "否", + Ownership = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("省") ? "省属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("市") ? "市属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership : "", + //AreaName = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Province + "|" + planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().City : "", + + AreaName = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Province + "|" + (planmajordesc.Any(e => e.UniversityName == s.UniversityName) ?planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().City:"") : "", + Nature = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Nature : "", + Rank = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? (string.IsNullOrEmpty(planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().UniversityRank) ? "--" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().UniversityRank) : "--", planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem() { - fee = c.Fee, + fee = string.IsNullOrEmpty(c.Fee) ? "--" : c.Fee, Major = c.MajorName, MajorCode = c.MajorCode, // MajorGroup = c.MajorGroup, diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index 873a60c..97603b0 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -268,10 +268,9 @@ namespace New_College.Repository { 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; + var maxscore = query.Score + 15; + var minscore = query.Score - 60; query.Year = query.Year > 2023 ? 2023 : query.Year; //var custome = (await this.v_CustomerInfo.QueryById(query.CustomerId)); // int planId = (await t_EnrollmentPlane.Query(e => e.Years == custome.Year && e.Area_Id == custome.AreaId)).FirstOrDefault().Id; @@ -290,7 +289,7 @@ namespace New_College.Repository .WhereIF(maxscore > 10, (plans, universitys) => plans.LowScore <= maxscore) .WhereIF(minscore > 0, (plans, universitys) => plans.LowScore > minscore) .WhereIF(query.Ranking > 0, (plans, universitys) => plans.LowScoreRank >= query.Ranking - 6) - //.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.SelectSubject.Contains(sbuOne) || plans.SelectSubject.Contains(sbuTwo) || plans.SelectSubject.Contains(sbuTree))) + // .Where(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.SubjectType.Contains(sbuOne) || plans.SelectSubject.Contains(sbuTwo) || plans.SelectSubject.Contains(sbuTree))) .OrderBy((plans, universitys) => plans.LowScoreRank, OrderByType.Asc) .Select((plans, universitys) => new UniversityResult() {