diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index 2f01b62..38309f7 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -1166,6 +1166,16 @@ 院校官网 + + + 高校地址 + + + + + 电话 + + 院校简介 diff --git a/New_College.Api/index.html b/New_College.Api/index.html index 6a88948..eddeeeb 100644 --- a/New_College.Api/index.html +++ b/New_College.Api/index.html @@ -125,7 +125,7 @@ function getData() { if ($(".qqgroup").length <= 0) { - $('.info').after("
QQ二维码
查看所有注册的服务
"); + /* $('.info').after("
QQ二维码
查看所有注册的服务
");*/ console.log(2); clearInterval(int); } diff --git a/New_College.Model/Models/D_University.cs b/New_College.Model/Models/D_University.cs index 2db591c..24dd0d5 100644 --- a/New_College.Model/Models/D_University.cs +++ b/New_College.Model/Models/D_University.cs @@ -124,6 +124,19 @@ namespace New_College.Model.Models [SugarColumn(IsNullable = true)] public string Web { get; set; } + + /// + /// 高校地址 + /// + [SugarColumn(IsNullable = true)] + public string Address { get; set; } + + /// + /// 电话 + /// + [SugarColumn(IsNullable = true)] + public string Phone { get; set; } + /// /// 院校简介 /// diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index 63ba972..0fe5673 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -152,7 +152,7 @@ namespace New_College.Repository majoraslist = await this.d_Major.Query(x => x.IsDelete == false && SqlFunc.ContainsArray(query.MajorIds, x.Id)); if (majoraslist.Count() <= 0) return new MessageModel>() { success = false, msg = "所选专业大类数据完善中..." }; - majornames = majoraslist.Select(x => x.MajorCode).ToList(); + majornames = majoraslist.Select(x => x.MajorName).ToList(); } @@ -166,7 +166,7 @@ namespace New_College.Repository .WhereIF(query.Type == "稳", p => p.LowScore > 0 && (p.LowScore <= query.Score + 5 && p.LowScore > query.Score - 15)) .WhereIF(query.Type == "保", p => p.LowScore > 0 && (p.LowScore < query.Score - 15)) .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p.SelectSubject, sbuOne) || SqlFunc.Contains(p.SelectSubject, sbuTwo) || SqlFunc.Contains(p.SelectSubject, sbuTree))) - .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode)).GroupBy(plans => new + .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.Major)).GroupBy(plans => new { // plans.Id, plans.UId, diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 8339b90..139ded2 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -847,7 +847,7 @@ namespace New_College.Services /// public async Task> GetUniversityRank(UniversityRankQuery query) { - var info = await d_UniversityRankRepository.Query(x => x.IsDelete == false && x.UniversityType == query.Type); + var info = await d_UniversityRankRepository.Query(x => x.IsDelete == false && x.UniversityType == query.Type&&x.Year== "2023"); if (info.Count <= 0) return new List() { }; List list = new List() { }; @@ -1798,35 +1798,38 @@ namespace New_College.Services //}); #region *******************院校信息更新****************** - for (var i = 1; i <= 147; i++) - { - var body = new HttpHelperPostRequest() { pageIndex = i }; - var info = HttpHelper.PostApi("http://192.168.104.104:3000/youzy.dms.basiclib.api.college.query", body); + //for (var i = 1; i <= 147; i++) + //{ + // var body = new HttpHelperPostRequest() { pageIndex = i }; + // var info = HttpHelper.PostApi("http://192.168.104.104:3000/youzy.dms.basiclib.api.college.query", body); - info.result.items.ToList().ForEach(async a => - { + // info.result.items.ToList().ForEach(async a => + // { - //http://192.168.104.104:3000/youzy.dms.basiclib.api.college.bycode.get?code=10017 //详情 - // var bodydetail = new httphelperdetailrequest() { code = a.code }; - var undetail = HttpHelper.GetApi("http://192.168.104.104:3000/", "youzy.dms.basiclib.api.college.bycode.get?code=" + a.code + "", ""); - Thread.Sleep(1000); - var universitymodel = await d_UniversityRepository.Query(c => c.Name == a.cnName); - if (universitymodel.Any() && undetail != null && undetail.result != null) - { - var updatemodel = universitymodel.FirstOrDefault(); - updatemodel.UniversityCode = a.code; - updatemodel.Rank = a.ranking; - updatemodel.Build_Date = undetail.result.createdYear; - updatemodel.Description = undetail.result.introduction; - updatemodel.Master_Count = undetail.result.pointsOfShuo.Any() ? undetail.result.pointsOfShuo[0].number : 0; - updatemodel.Doctorate_Count = undetail.result.pointsOfBo.Any() ? undetail.result.pointsOfBo[0].number : 0; - updatemodel.Type = UniversityTypeRelsove.GetTypeName((undetail.result.categories.Any() ? undetail.result.categories[0] : "")); - await d_UniversityRepository.Update(updatemodel); - } + // //http://192.168.104.104:3000/youzy.dms.basiclib.api.college.bycode.get?code=10017 //详情 + // // var bodydetail = new httphelperdetailrequest() { code = a.code }; + // var undetail = HttpHelper.GetApi("http://192.168.104.104:3000/", "youzy.dms.basiclib.api.college.bycode.get?code=" + a.code + "", ""); + // Thread.Sleep(1000); + // var universitymodel = await d_UniversityRepository.Query(c => c.Name == a.cnName); + // if (universitymodel.Any() && undetail != null && undetail.result != null) + // { + // var updatemodel = universitymodel.FirstOrDefault(); + // //updatemodel.Web = undetail.result.webSite; + // //updatemodel.Address = undetail.result.address[0].address; + // //updatemodel.Phone = string.Join(",",undetail.result.zhaoBanDH); + // updatemodel.AscriptionName = undetail.result.belong; + // //updatemodel.UniversityCode = a.code; + // //updatemodel.Rank = a.ranking; + // //updatemodel.Build_Date = undetail.result.createdYear; + // //updatemodel.Description = undetail.result.introduction; + // //updatemodel.Master_Count = undetail.result.pointsOfShuo.Any() ? undetail.result.pointsOfShuo[0].number : 0; + // //updatemodel.Doctorate_Count = undetail.result.pointsOfBo.Any() ? undetail.result.pointsOfBo[0].number : 0; + // //updatemodel.Type = UniversityTypeRelsove.GetTypeName((undetail.result.categories.Any() ? undetail.result.categories[0] : "")); + // await d_UniversityRepository.Update(updatemodel); + // } - }); - - } + // }); + //} #endregion diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index 6e4ef09..5298fa1 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -873,6 +873,9 @@ namespace New_College.Services var universityinfoline = await _QualificationLineRepository.Query(c => c.UId == query.UniversityId); if (universityinfoline == null) return new MessageModel() { success = false, msg = "院校信息不存在" }; + + var universitydetail = await d_UniversityRepository.QueryById(query.UniversityId); + UniversityProbabilityResult model = new UniversityProbabilityResult() { }; var scoreline = await _ScoreLineRepository.Query(c => c.Years == query.Year.ToString() && c.Province == query.AreaName && c.Score == query.Score.ToString()); @@ -885,6 +888,16 @@ namespace New_College.Services Year = c.Years }).ToList(); + model.Sff = universityinfoline.FirstOrDefault()._211 == "是" ? true : false; + model.Nhef = universityinfoline.FirstOrDefault()._985 == "是" ? true : false; + model.Syl = universityinfoline.FirstOrDefault()._SYL == "是" ? true : false; + model.Name = universityinfoline.FirstOrDefault().UniversityName; + model.Logo = universitydetail.Logo; + model.Nature = universitydetail.Nature; + model.AreaName = universitydetail.Area_Name; + model.AscriptionName = universitydetail.AscriptionName; + model.Rank = universitydetail.Rank; + model.SubjectLevel = universitydetail.Subject_Level; model.EstimateScore = Math.Round(model.YearBatchScores.Average(c => c.Score), 0); double tmpscore = 0; if (scoreline.Any()) @@ -894,9 +907,8 @@ namespace New_College.Services // model.Probability = tmpscore >= model.EstimateScore ? "" : ""; } - - model.Proposal = tmpscore + 5 > model.EstimateScore ? "成功几率较好，建议可以填报" : tmpscore + 5 == model.EstimateScore ? "成功几率较低，建议谨慎考虑" : tmpscore < model.EstimateScore ? "风险过高，建议谨慎考虑" : "风险过高，不建议填报"; + model.Probability = tmpscore + 5 > model.EstimateScore ? new Random().Next(80, 99) : tmpscore + 5 == model.EstimateScore ? new Random().Next(40, 70) : tmpscore < model.EstimateScore ? new Random().Next(0, 30) : new Random().Next(0, 15); return new MessageModel() { success = true, @@ -1523,7 +1535,7 @@ namespace New_College.Services public async Task>> GetUniversityPlanBatch(YearAreaQuery query) { - // query.Year = query.Year.HasValue && query.Year > 2023 ? 2023 : query.Year; + // query.Year = query.Year.HasValue && query.Year > 2023 ? 2023 : query.Year; Expression> expression = Expressionable.Create() .And(c => c.IsDelete == false) .And(c => c.AreaName == query.AreaName)