diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index c917206..5f6c822 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -141,22 +141,23 @@ namespace New_College.Api.Controllers.Front { typeinfo = s.VolunteerRemark.FromJson>(); } + var planstatus = planmajordesc.Any(e => e.UniversityName == s.UniversityName); + var firstmodels = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault(); var uitem = new VolunteerTableDetailItemsView() { - // UniversityId = s.UniversityId, + UniversityName = s.UniversityName, UniversityCode = s.UniversityCode, Sort = s.OrderSort, UniversityId = s.UniversityId, - _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 : "", + _211 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("211") ? "是" : "否" : "否" : "否", + _985 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("985") ? "是" : "否" : "否" : "否", + _SYL = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("双一流") ? "是" : "否" : "否" : "否", + Ownership = planstatus ? firstmodels.Ownership != null ? firstmodels.Ownership.Contains("省") ? "省属" : firstmodels.Ownership.Contains("市") ? "市属" : firstmodels.Ownership : "" : "", - 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) : "--", + AreaName = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "", + Nature = planstatus ? firstmodels.Nature != null ? firstmodels.Nature : "" : "", + Rank = planstatus ? (string.IsNullOrEmpty(firstmodels.UniversityRank) ? "--" : firstmodels.UniversityRank) : "--", planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem() { @@ -175,21 +176,21 @@ namespace New_College.Api.Controllers.Front PlanItems = new List() { new PlanItem() { - PlanCount=int.Parse(c._23Count), - RankLine=int.Parse(c._23ScoreLine), - Scoreline=int.Parse(c._23Score), + PlanCount=c._23Count=="0"?"--":c._23Count, + RankLine=c._23ScoreLine=="0"?"--":c._23ScoreLine, + Scoreline=c._23Score == "0" ? "--" : c._23Count, Year="2023" }, new PlanItem() { - PlanCount=int.Parse(c._22Count), - RankLine=int.Parse(c._22ScoreLine), - Scoreline=int.Parse(c._22Score), + PlanCount=c._22Count=="0"?"--":c._22Count, + RankLine=c._22ScoreLine=="0"?"--":c._22ScoreLine, + Scoreline=c._22Score == "0" ? "--" : c._22Count, Year="2022" }, new PlanItem() { - PlanCount=int.Parse(c._21Count), - RankLine=int.Parse(c._21ScoreLine), - Scoreline=int.Parse(c._21Score), + PlanCount=c._21Count=="0"?"--":c._21Count, + RankLine=c._21ScoreLine=="0"?"--":c._21ScoreLine, + Scoreline=c._21Score == "0" ? "--" : c._21Count, Year="2021" } } }).ToList() diff --git a/New_College.Api/Controllers/Front/TestController.cs b/New_College.Api/Controllers/Front/TestController.cs index 61ca41f..e425649 100644 --- a/New_College.Api/Controllers/Front/TestController.cs +++ b/New_College.Api/Controllers/Front/TestController.cs @@ -93,7 +93,6 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - public async Task>> GetQuestion([FromQuery] appQuestionQuery query) { var result = await test_QuestionInfoServices.GetQuestion(query); @@ -110,7 +109,6 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - public async Task>> GetQuestionMBTI() { var result = await test_QuestionInfoServices.GetQuestionMBTI(); diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs index d2d2694..4309d5a 100644 --- a/New_College.Api/Controllers/HealthCheckController.cs +++ b/New_College.Api/Controllers/HealthCheckController.cs @@ -69,9 +69,9 @@ namespace New_College.Controllers //return d_LongIdMapServices.UpdateUniveristyInf(); //更新院校分数线 - // await d_LongIdMapServices.UpdateSchoolScoreLine23(); + //await d_LongIdMapServices.UpdateSchoolScoreLine23("四川省"); - // await d_LongIdMapServices.PlanNeedProSync("浙江省", 2023, "综合", "普通类二段"); + await d_LongIdMapServices.PlanNeedProSync("四川省", 2023, "理科", "本科二批"); // await v_CustomerInfoServices.CustomeBillExport(); return true; } diff --git a/New_College.Api/appsettings.Development.json b/New_College.Api/appsettings.Development.json index d2d6749..518d39c 100644 --- a/New_College.Api/appsettings.Development.json +++ b/New_College.Api/appsettings.Development.json @@ -97,7 +97,7 @@ "DBType": 0, "Enabled": true, "HitRate": 20, - "Connection": "Server=192.168.104.108; Port=3306;SslMode=None;Database=volunteerapp; Uid=root; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true" + "Connection": "Server=192.168.104.108; Port=3306;SslMode=None;Database=volunteerapp; Uid=root; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true;SslMode=none" }, { "ConnId": "MYSQL_CasDoor", diff --git a/New_College.IServices/ID_LongIdMapServices.cs b/New_College.IServices/ID_LongIdMapServices.cs index fe3e8d4..6cd5b4c 100644 --- a/New_College.IServices/ID_LongIdMapServices.cs +++ b/New_College.IServices/ID_LongIdMapServices.cs @@ -28,7 +28,7 @@ namespace New_College.IServices /// /// Task UpdatePlanScoreLine(); - Task UpdateSchoolScoreLine23(); + Task UpdateSchoolScoreLine23(string Location); Task UpdatePlanProInf(); Task Import(); diff --git a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs index c41ca8f..4ba573c 100644 --- a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs +++ b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs @@ -364,17 +364,17 @@ namespace New_College.Model.ViewModels public class PlanItem { public string Year { get; set; } - public int PlanCount { get; set; } + public string PlanCount { get; set; } public string Count { get; set; } /// /// 位次 /// - public int RankLine { get; set; } + public string RankLine { get; set; } ///// ///// 最低分 ///// - public int Scoreline { get; set; } + public string Scoreline { get; set; } } diff --git a/New_College.Repository/BASE/D_QualificationLineRepository.cs b/New_College.Repository/BASE/D_QualificationLineRepository.cs index b0b5e75..5db07b4 100644 --- a/New_College.Repository/BASE/D_QualificationLineRepository.cs +++ b/New_College.Repository/BASE/D_QualificationLineRepository.cs @@ -19,7 +19,7 @@ namespace New_College.Repository public async Task BatchAdd(List d_Qualifications) { - var kk = await this.Db.Fastest().PageSize(50000).BulkCopyAsync(d_Qualifications); + var kk = await this.Db.Fastest().BulkCopyAsync(d_Qualifications); return kk > 0; } diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index b741f07..0a02f57 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -252,7 +252,7 @@ namespace New_College.Repository } if (!string.IsNullOrWhiteSpace(query.SubjectClaim)) { - sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' )", claim01, claim02, claim03); + 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 "); diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 60affc3..e7c592f 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -1975,27 +1975,27 @@ namespace New_College.Services /// /// /// - public async Task UpdateSchoolScoreLine23() + public async Task UpdateSchoolScoreLine23(string Location) { var dsQualification = new List(); - var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); + var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == Location); - var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); - //var universitylist = await d_UniversityRepository.Query(); - planlist.ForEach(a => - { - var lany = list.Where(e => e.MajorCode == a.MajorCode && e.Major == a.Major && e.UniversityName == a.UniversityName); - if (lany.Any()) - { - var aa = lany.FirstOrDefault(); - a.UId = aa.UId; - a.BatchName = aa.BatchName; - } - }); + //var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); + var universitylist = await d_UniversityRepository.Query(); + //planlist.ForEach(a => + //{ + // var lany = list.Where(e => e.MajorCode == a.MajorCode && e.Major == a.Major && e.UniversityName == a.UniversityName); + // if (lany.Any()) + // { + // var aa = lany.FirstOrDefault(); + // a.UId = aa.UId; + // a.BatchName = aa.BatchName; + // } + //}); - await d_PlanMajorDescProRepository.Batchupdate(planlist); + //await d_PlanMajorDescProRepository.Batchupdate(planlist); //list.ForEach(c => //{ @@ -2004,28 +2004,40 @@ namespace New_College.Services // c.UId = universitylist.Where(e => e.Name == c.UniversityName).FirstOrDefault().Id; // } //}); - await d_PlanMajorScoreLineRepository.BatchUpdate(list); - var unlist = list.Select(c => c.UniversityName).Distinct().ToList(); + //await d_PlanMajorScoreLineRepository.BatchUpdate(list); + var unlist = list.Select(c => c.UId).Distinct().ToList(); unlist.ForEach(a => { - var models = list.Where(e => e.UniversityName == a).FirstOrDefault(); + var models = list.Where(e => e.UId == a).FirstOrDefault(); //先找出院校最低分 - dsQualification.Add(new D_QualificationLine() + var newmodel = new D_QualificationLine() { Years = models.Years, - UniversityName = a, + UniversityName = models.UniversityName, + AreaName = universitylist.Where(c => c.Id == a).FirstOrDefault().Name, + EducationType = universitylist.Where(c => c.Id == a).FirstOrDefault().Subject_Level == 0 ? "本科" : "专科", + ModifyTime = DateTime.Now, + Ownership = universitylist.Where(c => c.Id == a).FirstOrDefault().AscriptionName, + // RecruitCode = universitylist.Where(c => c.Name == a).FirstOrDefault().UniversityCode, + RecruitType = "", CreateTime = DateTime.Now, IsDelete = false, Location = models.Location, OrderSort = 0, UId = models.UId, - LowScore = list.Where(e => e.UniversityName == a).Select(c => c.LowScore).Min(), - LowScoreRank = list.Where(e => e.UniversityName == a).Select(c => c.LowScoreRank).Max() - }); + LowScore = list.Where(e => e.UId == a).Select(c => c.LowScore).Min(), + LowScoreRank = list.Where(e => e.UId == a).Select(c => c.LowScoreRank).Max(), + SubjectType = models.SubjectType, + BatchName = models.BatchName, + }; + dsQualification.Add(newmodel); + // await d_QualificationLineRepository.Add(newmodel); + }); + //var tt = dsQualification; + dsQualification.ForEach(async c => + { + await d_QualificationLineRepository.Add(c); }); - var tt = dsQualification; - await d_QualificationLineRepository.BatchAdd(dsQualification); - return true; } @@ -2283,38 +2295,41 @@ namespace New_College.Services { countid++; var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault(); - needlist.Add(new T_TbSNeedDataInfo() + if (u != null) { - ID = countid, - AcademicYear = a.AcademicYear, - // City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name - Province = u.Area_Name, - EducationCategory = u.Subject_Level == 0 ? "本科" : "专科", - EnrollmentCode = u.UniversityCode, - Fee = a.Free, - Location = a.Location, - MajorCode = a.MajorCode, - MajorName = a.Major, - MastersDegree = u.Master_Count.ToString(), - UniversityName = a.UniversityName, - Ownership = u.AscriptionName, - Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : "港澳台", - Remark = a.Remark, - PhDPoint = u.Doctorate_Count.ToString(), - SubjectType = subjectType, - _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", - _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", - _21Count = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", - _21Score = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", - _21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", - _23SchoolScoreLine = 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).Select(c => c.LowScoreRank).Max().ToString() : "0", - _23SchoolScore = 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).Select(c => c.LowScore).Min().ToString() : "0" - }); + needlist.Add(new T_TbSNeedDataInfo() + { + ID = countid, + AcademicYear = a.AcademicYear, + // City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name + Province = u.Area_Name, + EducationCategory = u.Subject_Level == 0 ? "本科" : "专科", + EnrollmentCode = u.UniversityCode, + Fee = a.Free, + Location = a.Location, + MajorCode = a.MajorCode, + MajorName = a.Major, + MastersDegree = u.Master_Count.ToString(), + UniversityName = a.UniversityName, + Ownership = u.AscriptionName, + Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : "港澳台", + Remark = a.Remark, + PhDPoint = u.Doctorate_Count.ToString(), + SubjectType = subjectType, + _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", + _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", + _21Count = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", + _21Score = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", + _21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", + _23SchoolScoreLine = 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).Select(c => c.LowScoreRank).Max().ToString() : "0", + _23SchoolScore = 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).Select(c => c.LowScore).Min().ToString() : "0" + }); + } }); var tt = needlist; diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index 8e38111..1844340 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -299,25 +299,24 @@ namespace New_College.Services Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(t._23Score), request.Score), PlanItems = new List() { - new PlanItem() { - PlanCount=int.Parse(t._23Count), - RankLine=int.Parse(t._23ScoreLine), - Scoreline=int.Parse(t._23Score), - Year="2023" - }, - new PlanItem() { - PlanCount=int.Parse(t._22Count), - RankLine=int.Parse(t._22ScoreLine), - Scoreline=int.Parse(t._22Score), - Year="2022" - }, - new PlanItem() { - PlanCount=int.Parse(t._21Count), - RankLine=int.Parse(t._21ScoreLine), - Scoreline=int.Parse(t._21Score), - Year="2021" - }, - } + new PlanItem() { + PlanCount=t._23Count, + RankLine=t._23ScoreLine, + Scoreline=t._23Score, + Year="2023" + }, + new PlanItem() { + PlanCount=t._22Count, + RankLine=t._22ScoreLine, + Scoreline=t._22Score, + Year="2022" + }, + new PlanItem() { + PlanCount=t._21Count, + RankLine=t._21ScoreLine, + Scoreline=t._21Score, + Year="2021" + } } }).ToList(); }); @@ -413,23 +412,23 @@ namespace New_College.Services LowScore = int.Parse(c._23SchoolScore), PlanItems = new List() { - new PlanItem() { - PlanCount=int.Parse(c._23Count), - RankLine=int.Parse(c._23ScoreLine), - Scoreline=int.Parse(c._23Score), - Year="2023" - }, - 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" + new PlanItem() { + PlanCount=c._23Count, + RankLine=c._23ScoreLine, + Scoreline=c._23Score, + Year="2023" + }, + new PlanItem() { + PlanCount=c._22Count, + RankLine=c._22ScoreLine, + Scoreline=c._22Score, + Year="2022" + }, + new PlanItem() { + PlanCount=c._21Count, + RankLine=c._21ScoreLine, + Scoreline=c._21Score, + Year="2021" }, } }).ToList(); diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index e6de3f0..80f801f 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -616,25 +616,24 @@ namespace New_College.Services AcademicYear = item.AcademicYear, planItems = new List() { - new PlanItem() { - PlanCount=int.Parse(item._23Count), - RankLine=int.Parse(item._22ScoreLine), - Scoreline=int.Parse(item._23Score), - Year="2023" - }, - 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" - }, - } + new PlanItem() { + PlanCount=item._23Count, + RankLine=item._23ScoreLine, + Scoreline=item._23Score, + Year="2023" + }, + new PlanItem() { + PlanCount=item._22Count, + RankLine=item._22ScoreLine, + Scoreline=item._22Score, + Year="2022" + }, + new PlanItem() { + PlanCount=item._21Count, + RankLine=item._21ScoreLine, + Scoreline=item._21Score, + Year="2021" + } } }); } return new MessageModel>()