From ac2530a1953134037fad51f26ed262b0f5346328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Tue, 25 Jun 2024 11:49:01 +0800 Subject: [PATCH] bug fixed --- .../Front/PcVolunteerController.cs | 4 +- .../Controllers/HealthCheckController.cs | 2 +- New_College.Api/New_College.Model.xml | 97 +++++++++++++++++ New_College.Api/New_College.xml | 7 ++ .../Helper/MajorPlanScoreTool.cs | 2 +- New_College.Model/Models/T_TbSNeedDataInfo.cs | 2 +- .../BASE/T_EnrollmentPlanedescRepository.cs | 4 +- New_College.Services/D_LongIdMapServices.cs | 101 ++++++++++++------ .../D_PlanMajorDescServices.cs | 7 +- .../T_EnrollmentPlanedescServices.cs | 8 +- .../V_CustomerInfoServices.cs | 6 ++ 11 files changed, 191 insertions(+), 49 deletions(-) diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 24e61e3..2dc6afd 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -184,7 +184,7 @@ namespace New_College.Api.Controllers.Front { new PlanItem() { PlanCount=c._23Count=="0"?"--":c._23Count, - RankLine=c._23ScoreLine=="0"?"--":c._23ScoreLine, + RankLine=c._23ScoreLine==0?"--":c._23ScoreLine.ToString(), Scoreline=c._23Score == "0" ? "--" : c._23Score, Year="2023" }, @@ -278,7 +278,7 @@ namespace New_College.Api.Controllers.Front _21Scoreline = a._21Score == "0" ? "--" : a._21Score, _22RankLine = a._22ScoreLine == "0" ? "--" : a._22ScoreLine, _22Scoreline = a._22Score == "0" ? "--" : a._22Score, - _23RankLine = a._23ScoreLine == "0" ? "--" : a._23ScoreLine, + _23RankLine = a._23ScoreLine == 0? "--" : a._23ScoreLine.ToString(), _23Scoreline = a._23Score == "0" ? "--" : a._23Score, }); }); diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs index 7168514..3f72748 100644 --- a/New_College.Api/Controllers/HealthCheckController.cs +++ b/New_College.Api/Controllers/HealthCheckController.cs @@ -73,7 +73,7 @@ namespace New_College.Controllers // await d_LongIdMapServices.PlanNeedProSync("上海市", 2024, "综合", "本科"); - // await d_LongIdMapServices.SyncnewNeedProSData("上海市", 2024, "综合", "本科"); + //await d_LongIdMapServices.SyncnewNeedProSData("上海市", 2024, "综合", "本科"); // await v_CustomerInfoServices.CustomeBillExport(); diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index 753d14b..b789511 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -2757,6 +2757,11 @@ 招生类型 + + + batchName + + 全国统一招生代码 @@ -2802,6 +2807,11 @@ + + + 最新招生人数 + + @@ -3479,6 +3489,11 @@ + + + 这里 + + 状态：0、未启用，1、启用，2、禁用 @@ -7920,6 +7935,88 @@ + + + 院校名称 + + + + + 院校编码 + + + + + 学校所在地区 + + + + + 公办|民办 + + + + + 专业代码 + + + + + + 专业组 + + + + + 专业名称 + + + + + 专业选科 + + + + + 计划数 + + + + + 学费 + + + + + 位次 + + + + + 位次 + + + + + 位次 + + + + + 志愿表名称 + + + + + + 志愿填报类型（智能填报|一键填报） + + + + + 选科科目 + + 计划数 diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml index 5a336f7..4b93dee 100644 --- a/New_College.Api/New_College.xml +++ b/New_College.Api/New_College.xml @@ -399,6 +399,13 @@ + + + 获取选科数据结果 + + + + 同分年份数据 diff --git a/New_College.Common/Helper/MajorPlanScoreTool.cs b/New_College.Common/Helper/MajorPlanScoreTool.cs index c285bd0..77bffe4 100644 --- a/New_College.Common/Helper/MajorPlanScoreTool.cs +++ b/New_College.Common/Helper/MajorPlanScoreTool.cs @@ -57,7 +57,7 @@ namespace New_College.Common { type = 1; } - if (LowScore >= requestScore && LowScore <= requestScore + 15) + if (LowScore >= requestScore && LowScore <= requestScore + 30) { type = 2; } diff --git a/New_College.Model/Models/T_TbSNeedDataInfo.cs b/New_College.Model/Models/T_TbSNeedDataInfo.cs index 0d3c5d2..14e6530 100644 --- a/New_College.Model/Models/T_TbSNeedDataInfo.cs +++ b/New_College.Model/Models/T_TbSNeedDataInfo.cs @@ -101,7 +101,7 @@ namespace New_College.Model.Models /// /// [SugarColumn(ColumnName = "_23ScoreLine")] - public string _23ScoreLine { get; set; } + public int _23ScoreLine { get; set; } /// /// /// diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index d3d6869..0d570e5 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -254,7 +254,7 @@ namespace New_College.Repository { sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03, "不限"); } - sqlstr.Append(" order by _23ScoreLine "); + sqlstr.Append("and _23ScoreLine>0 order by _23ScoreLine "); var recommendInfo = await this.Db.SqlQueryable(sqlstr.ToString()).ToListAsync(); @@ -324,7 +324,7 @@ namespace New_College.Repository msg = "获取成功", response = new PageModel() { - data = ulist.OrderBy(t => t.Percentage).OrderBy(t => t.SchoolScoreline).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList(), + data = ulist.OrderByDescending(t => t.Type).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList(), dataCount = universitylist.Count, page = query.PageIndex, PageSize = query.PageSize, diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index e13e5c4..7fd363e 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -2433,7 +2433,7 @@ namespace New_College.Services { ID = countid, AcademicYear = a.AcademicYear, - EnrollmentType= "普通计划", + EnrollmentType = "普通计划", // City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name Province = u.Area_Name, EducationCategory = u.Subject_Level == 0 ? "本科" : "专科", @@ -2451,14 +2451,14 @@ namespace New_College.Services _plancount = a.PlanCount, BatchName = a.BatchName, SubjectType = subjectType, - _23ScoreLine = a.LowScoreRank.ToString(), + _23ScoreLine = a.LowScoreRank, _23Score = a.LowScore.ToString(), _Score = a.LowScore.ToString(), _24subject = a.SelectSubject, _23subject = a.SelectSubject, _23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", - // _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", - // _23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", + // _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", + // _23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", _22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", _22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", _22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", @@ -2482,15 +2482,15 @@ namespace New_College.Services public async Task UpdatePlanProInf(string Location) { - var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location); + var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location); var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false); // var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false); #region************************更新招生计划合计**************************** - // var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023); - // var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023); - // var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false); + // var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023); + // var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023); + // var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false); //tbinfo.ForEach(o => //{ // if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) @@ -2520,8 +2520,9 @@ namespace New_College.Services #region ***********************更新相关参数*************************** - var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); - var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location); + // var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); + //var pronew = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Location == Location && e.Years == 2024 && e.BatchName == "本科"); + // var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location); tbinfo.ForEach(o => { //if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) @@ -2547,36 +2548,66 @@ namespace New_College.Services // o._23Count = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; // } //} - if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName)) + //o._23Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString(); + //o._23ScoreLine = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScoreRank; + //o._Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString(); + //if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName)) + //{ + + //o.UniversityRank = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().UniversityRank; + //o.City = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().City; + //o.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EmploymentQuality; + //o.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EnrollmentCode; + //if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName))) + //{ + // o.Fee = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().Fee; + // o.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().MjaorLevel; + // o.MajorCount = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel; + // o.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel; + // o.FirstType = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().FirstType; + //} + + + // o.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().LnstitutionalLevel; + + //o.MastersDegree = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersDegree; + //o.MastersMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersMajor; + + //o.Nature = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Nature; + //o.Ownership = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Ownership; + //o.PhDMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDMajor; + //o.PhDPoint = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDPoint; + //o.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().ProfessionalAssessment; + //o.Province = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Province; + //o.VRUrl = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().VRUrl; + // } + + if (universitylist.Any(e => e.Name == o.UniversityName)) { - o.UniversityRank = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().UniversityRank; - o.City = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().City; - o.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().EmploymentQuality; - o.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().EnrollmentCode; - if (tbsdinfo.Any(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName))) + if (string.IsNullOrWhiteSpace(o.LnstitutionalLevel)) { - o.Fee = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().Fee; - o.MjaorLevel = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().MjaorLevel; - o.MajorCount = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel; - o.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel; - o.FirstType = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().FirstType; + string str = string.Empty; + if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Nhef > 0) + { + str += "985/"; + } + if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Sff > 0) + { + str += "211/"; + } + if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Syl > 0) + { + str += "双一流/"; + } + if (str.Contains("985") && str.Contains("211")) + { + str += "保研资格/"; + } + o.LnstitutionalLevel = str; } - - - o.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().LnstitutionalLevel; - - o.MastersDegree = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().MastersDegree; - o.MastersMajor = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().MastersMajor; - - o.Nature = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().Nature; - o.Ownership = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().Ownership; - o.PhDMajor = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().PhDMajor; - o.PhDPoint = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().PhDPoint; - o.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().ProfessionalAssessment; - o.Province = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().Province; - o.VRUrl = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().VRUrl; } + }); await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index 6753fba..1eb59f6 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -301,7 +301,7 @@ namespace New_College.Services { new PlanItem() { PlanCount=t._23Count, - RankLine=t._23ScoreLine, + RankLine=t._23ScoreLine.ToString(), Scoreline=t._23Score, Year="2023" }, @@ -366,6 +366,7 @@ namespace New_College.Services Expression> expression3 = Expressionable.Create() .And(c => c.Location == request.Location) .And(c => c.SubjectType == batchtypeName) + .And(c => c._23ScoreLine > 0) .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c._24subject, claim01) || SqlFunc.Contains(c._24subject, claim02) || SqlFunc.Contains(c._24subject, claim03) || c._24subject == "不限") .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) @@ -385,7 +386,7 @@ namespace New_College.Services Name = c.Name, }).ToList(); - var responselist = querylist.Select(c => new OneSubmitGoResponse() + var responselist = querylist.OrderBy(c => c._23ScoreLine).Select(c => new OneSubmitGoResponse() { AreaName = c.Province, @@ -415,7 +416,7 @@ namespace New_College.Services { new PlanItem() { PlanCount=c._23Count, - RankLine=c._23ScoreLine, + RankLine=c._23ScoreLine.ToString(), Scoreline=c._23Score, Year="2023" }, diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index e5983e7..e6be941 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -625,7 +625,7 @@ namespace New_College.Services new PlanItem() { PlanCount=item._23Count, - RankLine=item._23ScoreLine, + RankLine=item._23ScoreLine.ToString(), Scoreline=item._23Score, Year="2023" }, @@ -1258,7 +1258,7 @@ namespace New_College.Services PlanName = x.MajorName, PlanNum = int.Parse(x._23Count), Scoreline = x._23Score == "0" ? "-" : x._23Score, - LowScoreRank = x._23ScoreLine == "0" ? "-" : x._23ScoreLine + LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString() }).ToList(); count.FirstOrDefault().Infos.AddRange(newinfos); } @@ -1285,7 +1285,7 @@ namespace New_College.Services PlanName = x.MajorName, PlanNum = int.Parse(x._23Count), Scoreline = x._23Score == "0" ? "-" : x._23Score, - LowScoreRank = x._23ScoreLine == " 0" ? "-" : x._23ScoreLine, + LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString(), YearName = yearName, 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, @@ -1604,7 +1604,7 @@ namespace New_College.Services /// public async Task>> GetBatchByYearArea(YearAreaQuery query) { - query.Year = query.Year.HasValue && query.Year >= 2024 ? 2023 : query.Year;//获取批次信息新数据出来2023后需更新成2024 + query.Year = query.Year.HasValue && query.Year >= 2024 ? 2024 : query.Year;//获取批次信息新数据出来2023后需更新成2024 Expression> expression = Expressionable.Create() .And(c => c.IsDelete == false) .And(c => !c.Batch_name.Contains("提前")) diff --git a/New_College.Services/V_CustomerInfoServices.cs b/New_College.Services/V_CustomerInfoServices.cs index 4b83bb5..efbeff1 100644 --- a/New_College.Services/V_CustomerInfoServices.cs +++ b/New_College.Services/V_CustomerInfoServices.cs @@ -370,9 +370,15 @@ namespace New_College.Services { BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科一批").Any() ? "本科一批" : batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科二批").Any() ? "本科二批" : "专科批"; } + else if (info.AreaName == "上海市") + { + BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科").Any() ? "本科" : "专科"; + } else { + BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段"; + } if (!string.IsNullOrWhiteSpace(info.Phone) && !info.IsVIP) {