diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 200fe75..b399cd6 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -1991,8 +1991,8 @@ namespace New_College.Services public async Task UpdatePlanProInf() { var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "河南省"); - //var universitylist = await d_UniversityRepository.Query(); - //var majorlist = await d_MajorRepository.Query(); + var universitylist = await d_UniversityRepository.Query(); + var majorlist = await d_MajorRepository.Query(); @@ -2036,43 +2036,43 @@ namespace New_College.Services #region ***********************更新相关参数*************************** - var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); + //var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); - tbinfo.ForEach(e => - { + //tbinfo.ForEach(e => + //{ - if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName)) - { + // 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.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel; - 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); + // 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); #endregion @@ -2081,32 +2081,33 @@ namespace New_College.Services #region 院校专业关联 - //var models = new List(); - //tbinfo.ForEach(a => - //{ - // if (universitylist.Where(e => e.Name == a.UniversityName).Any()) - // { - // if (majorlist.Where(e => a.MajorName.Contains(e.Name)).Any()) - // { - // var mid = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id; - // var uid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id; - // if (!models.Where(e => e.Universityid == uid && e.MajorId == mid).Any()) - // { - // models.Add(new D_MajorMapUniversity() - // { - // CreateTime = DateTime.UtcNow, - // IsDelete = false, - // ModifyTime = DateTime.UtcNow, - // OrderSort = 0, - // sp = 0, - // MajorId = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id, - // Universityid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id - // }); - // } - // } - // } - //}); - //await d_MajorMapUniversityRepository.Add(models); + var models = new List(); + tbinfo.ForEach(async a => + { + if (universitylist.Where(e => e.Name == a.UniversityName).Any()) + { + if (majorlist.Where(e => a.MajorName.Contains(e.Name)).Any()) + { + var mid = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id; + var uid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id; + if (!models.Where(e => e.Universityid == uid && e.MajorId == mid).Any()) + { + if (!(await d_MajorMapUniversityRepository.Query(q => q.Universityid == uid && q.MajorId == mid)).Any()) + models.Add(new D_MajorMapUniversity() + { + CreateTime = DateTime.UtcNow, + IsDelete = false, + ModifyTime = DateTime.UtcNow, + OrderSort = 0, + sp = 0, + MajorId = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id, + Universityid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id + }); + } + } + } + }); + await d_MajorMapUniversityRepository.Add(models); #endregion diff --git a/New_College.Services/D_UserSettingBaseServices.cs b/New_College.Services/D_UserSettingBaseServices.cs index 09d6406..05ac7af 100644 --- a/New_College.Services/D_UserSettingBaseServices.cs +++ b/New_College.Services/D_UserSettingBaseServices.cs @@ -48,7 +48,7 @@ namespace New_College.Services { usersettinglist.ForEach(a => { - a.ScoreCount = 10; + a.ScoreCount = 1; a.SearchCount = 9999; a.ShowCount = 9999; }); @@ -64,8 +64,8 @@ namespace New_College.Services OrderSort = 0, PType = 0, ScoreCount = customerinfo.FirstOrDefault().IsVIP ? 10 : 3, - SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10, - ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10, + SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 1, + ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 1, }; var basesettingtypeinfo = new D_UserSettingBase() @@ -76,8 +76,8 @@ namespace New_College.Services OrderSort = 0, PType = 1, ScoreCount = customerinfo.FirstOrDefault().IsVIP ? 10 : 3, - SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10, - ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10, + SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 1, + ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 1, }; await _dal.Add(basesettinginfo); await _dal.Add(basesettingtypeinfo); @@ -98,9 +98,9 @@ namespace New_College.Services { userbaselist.Where(e => e.CustomerId == c.Id).ToList().ForEach(models => { - models.ScoreCount = c.IsVIP ? 10 : 3; - models.SearchCount = c.IsVIP ? 9999 : 10; - models.ShowCount = c.IsVIP ? 9999 : 10; + models.ScoreCount = c.IsVIP ? 1 : 3; + models.SearchCount = c.IsVIP ? 9999 : 1; + models.ShowCount = c.IsVIP ? 9999 : 1; models.ModifyTime = DateTime.Now; modelslist.Add(models); });