diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs index 8f3bf9c..265dd23 100644 --- a/New_College.Api/Controllers/HealthCheckController.cs +++ b/New_College.Api/Controllers/HealthCheckController.cs @@ -71,13 +71,13 @@ namespace New_College.Controllers //更新院校分数线 // await d_LongIdMapServices.UpdateSchoolScoreLine23("河南省","理科"); - // await d_LongIdMapServices.PlanNeedProSync("山东省", 2024, "综合", "普通类一段"); - // await d_LongIdMapServices.SyncnewNeedProSData("山东省", 2024, "综合", "普通类一段"); + //await d_LongIdMapServices.PlanNeedProSync("河南省", 2024, "文科", "本科二批"); + // await d_LongIdMapServices.SyncnewNeedProSData("河南省", 2024, "文科", "本科一批"); // await v_CustomerInfoServices.CustomeBillExport(); - // await d_LongIdMapServices.UpdatePlanProInf(); - await d_LongIdMapServices.UpdatePlanProInf(); + await d_LongIdMapServices.UpdatePlanProInf(); + return true; } diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index a360451..e1a4920 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -2301,108 +2301,107 @@ namespace New_College.Services { var m = oldplist.Where(e => e.UId == a.UId && e.MajorCode == a.MajorCode); + if (string.IsNullOrWhiteSpace(a.CityName)) + { + a.CityName = u.CityName; + } + if (string.IsNullOrWhiteSpace(a.AreaName)) + { + a.AreaName = u.AreaName; + } + if (string.IsNullOrWhiteSpace(a.EducationCategory)) + { + a.EducationCategory = u.EducationCategory; + } + if (string.IsNullOrWhiteSpace(a.EnrollmentCode)) + { + a.EnrollmentCode = u.EnrollmentCode; + } + if (string.IsNullOrWhiteSpace(a.EnrollmentType)) + { + a.EnrollmentType = u.EnrollmentType; + } + if (string.IsNullOrWhiteSpace(a.FirstType)) + { + if (m.Any()) + { + a.FirstType = m.FirstOrDefault().FirstType; + } + } + if (string.IsNullOrWhiteSpace(a.FormerName)) + { + + a.FormerName = u.FormerName; + + } + if (string.IsNullOrWhiteSpace(a.Logo)) + { + a.Logo = u.Logo; + } + if (a.LowScore <= 0) + { + if (m.Any()) + { + a.LowScore = m.FirstOrDefault().LowScore; + } + } + + if (a.LowScoreRank <= 0) + { + if (m.Any()) + { + a.LowScoreRank = m.FirstOrDefault().LowScoreRank; + } + } + + if (string.IsNullOrWhiteSpace(a.Nature)) + { + a.Nature = u.Nature; + } + + if (a.NewCount <= 0)//差值 + { + if (m.Any()) + { + a.NewCount = a.PlanCount - m.FirstOrDefault().PlanCount; + } + } + + if (string.IsNullOrWhiteSpace(a.Ownership)) + { + a.Ownership = u.Ownership; + } + if (string.IsNullOrWhiteSpace(a.Rank)) + { + a.Rank = u.Rank; + } + if (string.IsNullOrWhiteSpace(a.RootType)) + { + if (m.Any()) + { + a.RootType = m.FirstOrDefault().RootType; + } + } + if (string.IsNullOrWhiteSpace(a.SchoolType)) + { + if (m.Any()) + { + a.SchoolType = m.FirstOrDefault().SchoolType; + } + } + if (string.IsNullOrWhiteSpace(a._211)) + { + a._211 = u._211; + } + if (string.IsNullOrWhiteSpace(a._985)) + { + a._985 = u._985; + } + if (string.IsNullOrWhiteSpace(a._SYL)) + { + a._SYL = u._SYL; + } } - - //if (string.IsNullOrWhiteSpace(a.CityName)) - //{ - // a.CityName = u.CityName; - //} - //if (string.IsNullOrWhiteSpace(a.AreaName)) - //{ - // a.AreaName = u.AreaName; - //} - //if (string.IsNullOrWhiteSpace(a.EducationCategory)) - //{ - // a.EducationCategory = u.EducationCategory; - //} - //if (string.IsNullOrWhiteSpace(a.EnrollmentCode)) - //{ - // a.EnrollmentCode = u.EnrollmentCode; - //} - //if (string.IsNullOrWhiteSpace(a.EnrollmentType)) - //{ - // a.EnrollmentType = u.EnrollmentType; - //} - //if (string.IsNullOrWhiteSpace(a.FirstType)) - //{ - // if (m.Any()) - // { - // a.FirstType = m.FirstOrDefault().FirstType; - // } - //} - //if (string.IsNullOrWhiteSpace(a.FormerName)) - //{ - - // a.FormerName = u.FormerName; - - //} - //if (string.IsNullOrWhiteSpace(a.Logo)) - //{ - // a.Logo = u.Logo; - //} - //if (a.LowScore <= 0) - //{ - // if (m.Any()) - // { - // a.LowScore = m.FirstOrDefault().LowScore; - // } - //} - - //if (a.LowScoreRank <= 0) - //{ - // if (m.Any()) - // { - // a.LowScoreRank = m.FirstOrDefault().LowScoreRank; - // } - //} - - //if (string.IsNullOrWhiteSpace(a.Nature)) - //{ - // a.Nature = u.Nature; - //} - - //if (a.NewCount <= 0)//差值 - //{ - // if (m.Any()) - // { - // a.NewCount = a.PlanCount - m.FirstOrDefault().PlanCount; - // } - //} - - //if (string.IsNullOrWhiteSpace(a.Ownership)) - //{ - // a.Ownership = u.Ownership; - //} - //if (string.IsNullOrWhiteSpace(a.Rank)) - //{ - // a.Rank = u.Rank; - //} - //if (string.IsNullOrWhiteSpace(a.RootType)) - //{ - // if (m.Any()) - // { - // a.RootType = m.FirstOrDefault().RootType; - // } - //} - //if (string.IsNullOrWhiteSpace(a.SchoolType)) - //{ - // if (m.Any()) - // { - // a.SchoolType = m.FirstOrDefault().SchoolType; - // } - //} - //if (string.IsNullOrWhiteSpace(a._211)) - //{ - // a._211 = u._211; - //} - //if (string.IsNullOrWhiteSpace(a._985)) - //{ - // a._985 = u._985; - //} - //if (string.IsNullOrWhiteSpace(a._SYL)) - //{ - // a._SYL = u._SYL; - //} } }); @@ -2434,6 +2433,7 @@ namespace New_College.Services { ID = countid, AcademicYear = a.AcademicYear, + EnrollmentType= "普通计划", // City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name Province = u.Area_Name, EducationCategory = u.Subject_Level == 0 ? "本科" : "专科", @@ -2479,8 +2479,8 @@ namespace New_College.Services public async Task UpdatePlanProInf() { - var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); - // var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false); + var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.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************************更新招生计划合计**************************** @@ -2517,8 +2517,8 @@ namespace New_College.Services #region ***********************更新相关参数*************************** - // var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); - var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == "山东省"); + var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "河南省"); + var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == "河南省"); tbinfo.ForEach(o => { if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) @@ -2536,37 +2536,44 @@ namespace New_College.Services 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"; + } } //if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName)) //{ - //e.UniversityRank = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().UniversityRank; - //e.City = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().City; - //e.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EmploymentQuality; - //e.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EnrollmentCode; - //if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName))) - //{ - // e.Fee = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().Fee; - // e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel; - // e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel; - // e.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel; - // e.FirstType = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().FirstType; + // e.UniversityRank = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().UniversityRank; + // e.City = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().City; + // e.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EmploymentQuality; + // e.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EnrollmentCode; + // if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName))) + // { + // e.Fee = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().Fee; + // e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel; + // e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel; + // e.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel; + // e.FirstType = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().FirstType; + // } + + + // e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel; + + // e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree; + // e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor; + + // e.Nature = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Nature; + // e.Ownership = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Ownership; + // e.PhDMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDMajor; + // e.PhDPoint = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDPoint; + // e.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().ProfessionalAssessment; + // e.Province = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Province; + // e.VRUrl = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().VRUrl; //} - - - //e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel; - - //e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree; - //e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor; - - //e.Nature = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Nature; - //e.Ownership = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Ownership; - //e.PhDMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDMajor; - //e.PhDPoint = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDPoint; - //e.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().ProfessionalAssessment; - //e.Province = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Province; - //e.VRUrl = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().VRUrl; - // } }); await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); @@ -2604,10 +2611,10 @@ namespace New_College.Services //await d_MajorMapUniversityRepository.Add(models); #endregion - //var universitylist=await un + #region 更新专业计划信息 - //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0); - //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2023 && c.IsDelete == false); + // var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0); + //var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "河南省" && c.Years == 2024 && c.IsDelete == false); //plist.ForEach(p => //{ // //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault(); @@ -2616,13 +2623,14 @@ namespace New_College.Services // var universitymodel = universitylist.Where(e => e.Id == p.UId).FirstOrDefault(); // if (universitymodel != null) // { - // // p.CityName = universitymodel.Area_Name; - // // p.EducationCategory = universitymodel.; + // 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; + // 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; @@ -2634,9 +2642,7 @@ namespace New_College.Services // //p.PlanCount = int.Parse(newmodel._23Count); // //p.LowScore = int.Parse(newmodel._23Score); // //p.LowScoreRank = int.Parse(newmodel._23ScoreLine); - // } - //}); //await this.d_PlanMajorDescProRepository.Batchupdate(plist);