diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs index d797a90..cb37131 100644 --- a/New_College.Api/Controllers/HealthCheckController.cs +++ b/New_College.Api/Controllers/HealthCheckController.cs @@ -74,11 +74,11 @@ namespace New_College.Controllers // await d_LongIdMapServices.PlanNeedProSync("山东省", 2024, "综合", "普通类二段"); - await d_LongIdMapServices.SyncnewNeedProSData("山东省", 2024, "综合", "普通类二段"); + //await d_LongIdMapServices.SyncnewNeedProSData("山东省", 2024, "综合", "普通类二段"); // await v_CustomerInfoServices.CustomeBillExport(); - //await d_LongIdMapServices.UpdatePlanProInf("山东省"); + await d_LongIdMapServices.UpdatePlanProInf("山东省"); return true; diff --git a/New_College.Api/appsettings.json b/New_College.Api/appsettings.json index d3070f6..80e0f1d 100644 --- a/New_College.Api/appsettings.json +++ b/New_College.Api/appsettings.json @@ -117,7 +117,7 @@ ], "Audience": { "Secret": "sdfsdfsrty25634kkhllghtdgdfss345t678fs", //不要太短，16位+ - "SecretFile": "C:\\my-file\\new_college.audience.secret.txt", //安全。内容就是Secret + "SecretFile": "", //安全。内容就是Secret "Issuer": "New_College", "Audience": "wr" }, diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 198b6a0..a4bd974 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -2484,7 +2484,7 @@ 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 && e.BatchName == "普通类二段"); var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false); // var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false); @@ -2522,96 +2522,97 @@ namespace New_College.Services #region ***********************更新相关参数*************************** - // 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)) - //{ - // if (o._21Score == "0") - // { - // o._21Score = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0"; - // o._21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0"; - // o._21Count = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; - // } + //var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); + // var pronew = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Location == Location && e.Years == 2023 && 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)) + { + if (o._21Score == "0" || o._21Score == null) + { + o._21Score = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0"; + o._21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0"; + o._21Count = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; + } - // if (o._22Score == "0") - // { - // o._22Score = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0"; - // o._22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0"; - // o._22Count = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; - // } + if (o._22Score == "0" || o._22Score == null) + { + o._22Score = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0"; + o._22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0"; + o._22Count = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; + } - // if (o._23Score == "0") - // { - // o._23Score = 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().LowScore.ToString() : "0"; - // o._23ScoreLine = 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().LowScoreRank.ToString() : "0"; - // 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"; - // } - //} - //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)) - //{ + if (o._23Score == "0" || o._23Score == null) + { + o.MajorName = o.MajorName.Contains("(") ? o.MajorName.Split("(")[0] : o.MajorName; + o._23Score = 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().LowScore.ToString() : "0"; + o._23ScoreLine = 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().LowScoreRank : 0; + 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"; + } + } + //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.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.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.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; - // } + // 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)) - // { + //if (universitylist.Any(e => e.Name == o.UniversityName)) + //{ - // if (string.IsNullOrWhiteSpace(o.LnstitutionalLevel)) - // { - // 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; - // } - // } + // if (string.IsNullOrWhiteSpace(o.LnstitutionalLevel)) + // { + // 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; + // } + //} - //}); - // await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); + }); + await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); #endregion @@ -2650,38 +2651,38 @@ namespace New_College.Services #region 更新专业计划信息 //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2024 && c.IsDelete == false); - var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2024 && c.IsDelete == false && c.Id >= 3407221); - plist.ForEach(p => - { - //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault(); - //if (newmodel != null) - //{ - var universitymodel = universitylist.Where(e => e.Id == p.UId).FirstOrDefault(); - if (universitymodel != null) - { - p.CityName = universitymodel.Area_Name; - p.EducationCategory = universitymodel.Subject_Level == 0 ? "本科" : "专科"; - p.EnrollmentCode = universitymodel.UniversityCode; - // p.EnrollmentType = newmodel.EnrollmentType; - //p.SchoolType=newmodel.sch - //p.FirstType = universitymodel.FirstType; - p.Nature = universitymodel.Nature == 0 ? "公办" : universitymodel.Nature == 1 ? "民办" : universitymodel.Nature == 2 ? "中外合作办学" : universitymodel.Nature == 3 ? "港澳台" : "独立学院"; - p.AreaName = universitymodel.Area_Name; - p.Ownership = universitymodel.AscriptionName; - p.Web = universitymodel.Web; - p.Logo = universitymodel.Logo; - p._985 = universitymodel.Nhef == 1 ? "是" : "否"; - p._211 = universitymodel.Sff == 1 ? "是" : "否"; - p._SYL = universitymodel.Syl == 1 ? "是" : "否"; - p.Rank = (universitymodel.Rank == 0 || universitymodel.Rank == 9999) ? "--" : universitymodel.Rank.ToString(); - //p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count); - //p.PlanCount = int.Parse(newmodel._23Count); - //p.LowScore = int.Parse(newmodel._23Score); - //p.LowScoreRank = int.Parse(newmodel._23ScoreLine); - } - }); + //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2024 && c.IsDelete == false && c.Id >= 3407221); + //plist.ForEach(p => + //{ + // //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault(); + // //if (newmodel != null) + // //{ + // var universitymodel = universitylist.Where(e => e.Id == p.UId).FirstOrDefault(); + // if (universitymodel != null) + // { + // p.CityName = universitymodel.Area_Name; + // p.EducationCategory = universitymodel.Subject_Level == 0 ? "本科" : "专科"; + // p.EnrollmentCode = universitymodel.UniversityCode; + // // p.EnrollmentType = newmodel.EnrollmentType; + // //p.SchoolType=newmodel.sch + // //p.FirstType = universitymodel.FirstType; + // p.Nature = universitymodel.Nature == 0 ? "公办" : universitymodel.Nature == 1 ? "民办" : universitymodel.Nature == 2 ? "中外合作办学" : universitymodel.Nature == 3 ? "港澳台" : "独立学院"; + // p.AreaName = universitymodel.Area_Name; + // p.Ownership = universitymodel.AscriptionName; + // p.Web = universitymodel.Web; + // p.Logo = universitymodel.Logo; + // p._985 = universitymodel.Nhef == 1 ? "是" : "否"; + // p._211 = universitymodel.Sff == 1 ? "是" : "否"; + // p._SYL = universitymodel.Syl == 1 ? "是" : "否"; + // p.Rank = (universitymodel.Rank == 0 || universitymodel.Rank == 9999) ? "--" : universitymodel.Rank.ToString(); + // //p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count); + // //p.PlanCount = int.Parse(newmodel._23Count); + // //p.LowScore = int.Parse(newmodel._23Score); + // //p.LowScoreRank = int.Parse(newmodel._23ScoreLine); + // } + //}); - await this.d_PlanMajorDescProRepository.Batchupdate(plist); + //await this.d_PlanMajorDescProRepository.Batchupdate(plist); #endregion #region 更新专业分数先选科数据