yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序端口 bug 修复

develop
old易 2023-12-04 14:34:37 +08:00
parent 0724612d60
commit 12cd58ec80
6 changed files with 71 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
New_College.Api/New_College.Model.xml
View File

@ -1166,6 +1166,16 @@
院校官网 院校官网
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Models.D_University.Address">
<summary>
高校地址
</summary>
</member>
<member name="P:New_College.Model.Models.D_University.Phone">
<summary>
电话
</summary>
</member>
<member name="P:New_College.Model.Models.D_University.Description"> <member name="P:New_College.Model.Models.D_University.Description">
<summary> <summary>
院校简介 院校简介

2
New_College.Api/index.html
View File

@ -125,7 +125,7 @@
function getData() { function getData() {
if ($(".qqgroup").length <= 0) { if ($(".qqgroup").length <= 0) {
$('.info').after("<div class='qqgroup'><img src='https://images.cnblogs.com/cnblogs_com/laozhang-is-phi/1284763/o_WeChat%20Screenshot_20191021142452.png' alt='QQ二维码' style='width: 450px;'><div style=\"margin-left: 16px;color: #4990e2;\"><a href=\"../allservices\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\">查看所有注册的服务</a></div></div><div style='clear: both;'></div>"); /* $('.info').after("<div class='qqgroup'><img src='https://images.cnblogs.com/cnblogs_com/laozhang-is-phi/1284763/o_WeChat%20Screenshot_20191021142452.png' alt='QQ二维码' style='width: 450px;'><div style=\"margin-left: 16px;color: #4990e2;\"><a href=\"../allservices\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"link\">查看所有注册的服务</a></div></div><div style='clear: both;'></div>");*/
console.log(2); console.log(2);
clearInterval(int); clearInterval(int);
} }

13
New_College.Model/Models/D_University.cs
View File

@ -124,6 +124,19 @@ namespace New_College.Model.Models
[SugarColumn(IsNullable = true)] [SugarColumn(IsNullable = true)]
public string Web { get; set; } public string Web { get; set; }
/// <summary>
/// 高校地址
/// </summary>
[SugarColumn(IsNullable = true)]
public string Address { get; set; }
/// <summary>
/// 电话
/// </summary>
[SugarColumn(IsNullable = true)]
public string Phone { get; set; }
/// <summary> /// <summary>
/// 院校简介 /// 院校简介
/// </summary> /// </summary>

4
New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
View File

@ -152,7 +152,7 @@ namespace New_College.Repository
majoraslist = await this.d_Major.Query(x => x.IsDelete == false && SqlFunc.ContainsArray(query.MajorIds, x.Id)); majoraslist = await this.d_Major.Query(x => x.IsDelete == false && SqlFunc.ContainsArray(query.MajorIds, x.Id));
if (majoraslist.Count() <= 0) if (majoraslist.Count() <= 0)
return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选专业大类数据完善中..." }; return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { 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 + 5 && p.LowScore > query.Score - 15))
.WhereIF(query.Type == "保", p => p.LowScore > 0 && (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(!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.Id,
plans.UId, plans.UId,

57
New_College.Services/D_LongIdMapServices.cs
View File

@ -847,7 +847,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<List<UniversityRankList>> GetUniversityRank(UniversityRankQuery query) public async Task<List<UniversityRankList>> 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) if (info.Count <= 0)
return new List<UniversityRankList>() { }; return new List<UniversityRankList>() { };
List<UniversityRankList> list = new List<UniversityRankList>() { }; List<UniversityRankList> list = new List<UniversityRankList>() { };
@ -1798,35 +1798,38 @@ namespace New_College.Services
//}); //});
#region *******************院校信息更新****************** #region *******************院校信息更新******************
for (var i = 1; i <= 147; i++) //for (var i = 1; i <= 147; i++)
{ //{
var body = new HttpHelperPostRequest() { pageIndex = i }; // var body = new HttpHelperPostRequest() { pageIndex = i };
var info = HttpHelper.PostApi<HttpHelperPostobject>("http://192.168.104.104:3000/youzy.dms.basiclib.api.college.query", body); // var info = HttpHelper.PostApi<HttpHelperPostobject>("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 //详情 // //http://192.168.104.104:3000/youzy.dms.basiclib.api.college.bycode.get?code=10017 //详情
// var bodydetail = new httphelperdetailrequest() { code = a.code }; // // var bodydetail = new httphelperdetailrequest() { code = a.code };
var undetail = HttpHelper.GetApi<UniversityDetailobject>("http://192.168.104.104:3000/", "youzy.dms.basiclib.api.college.bycode.get?code=" + a.code + "", ""); // var undetail = HttpHelper.GetApi<UniversityDetailobject>("http://192.168.104.104:3000/", "youzy.dms.basiclib.api.college.bycode.get?code=" + a.code + "", "");
Thread.Sleep(1000); // Thread.Sleep(1000);
var universitymodel = await d_UniversityRepository.Query(c => c.Name == a.cnName); // var universitymodel = await d_UniversityRepository.Query(c => c.Name == a.cnName);
if (universitymodel.Any() && undetail != null && undetail.result != null) // if (universitymodel.Any() && undetail != null && undetail.result != null)
{ // {
var updatemodel = universitymodel.FirstOrDefault(); // var updatemodel = universitymodel.FirstOrDefault();
updatemodel.UniversityCode = a.code; // //updatemodel.Web = undetail.result.webSite;
updatemodel.Rank = a.ranking; // //updatemodel.Address = undetail.result.address[0].address;
updatemodel.Build_Date = undetail.result.createdYear; // //updatemodel.Phone = string.Join(",",undetail.result.zhaoBanDH);
updatemodel.Description = undetail.result.introduction; // updatemodel.AscriptionName = undetail.result.belong;
updatemodel.Master_Count = undetail.result.pointsOfShuo.Any() ? undetail.result.pointsOfShuo[0].number : 0; // //updatemodel.UniversityCode = a.code;
updatemodel.Doctorate_Count = undetail.result.pointsOfBo.Any() ? undetail.result.pointsOfBo[0].number : 0; // //updatemodel.Rank = a.ranking;
updatemodel.Type = UniversityTypeRelsove.GetTypeName((undetail.result.categories.Any() ? undetail.result.categories[0] : "")); // //updatemodel.Build_Date = undetail.result.createdYear;
await d_UniversityRepository.Update(updatemodel); // //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 #endregion

18
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -873,6 +873,9 @@ namespace New_College.Services
var universityinfoline = await _QualificationLineRepository.Query(c => c.UId == query.UniversityId); var universityinfoline = await _QualificationLineRepository.Query(c => c.UId == query.UniversityId);
if (universityinfoline == null) if (universityinfoline == null)
return new MessageModel<UniversityProbabilityResult>() { success = false, msg = "院校信息不存在" }; return new MessageModel<UniversityProbabilityResult>() { success = false, msg = "院校信息不存在" };
var universitydetail = await d_UniversityRepository.QueryById(query.UniversityId);
UniversityProbabilityResult model = new UniversityProbabilityResult() { }; UniversityProbabilityResult model = new UniversityProbabilityResult() { };
var scoreline = await _ScoreLineRepository.Query(c => c.Years == query.Year.ToString() && c.Province == query.AreaName && c.Score == query.Score.ToString()); 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 Year = c.Years
}).ToList(); }).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); model.EstimateScore = Math.Round(model.YearBatchScores.Average(c => c.Score), 0);
double tmpscore = 0; double tmpscore = 0;
if (scoreline.Any()) if (scoreline.Any())
@ -894,9 +907,8 @@ namespace New_College.Services
// model.Probability = tmpscore >= model.EstimateScore ? "" : ""; // model.Probability = tmpscore >= model.EstimateScore ? "" : "";
} }
model.Proposal = tmpscore + 5 > model.EstimateScore ? "成功几率较好，建议可以填报" : tmpscore + 5 == model.EstimateScore ? "成功几率较低，建议谨慎考虑" : 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<UniversityProbabilityResult>() return new MessageModel<UniversityProbabilityResult>()
{ {
success = true, success = true,
@ -1523,7 +1535,7 @@ namespace New_College.Services
public async Task<MessageModel<List<IdNameResult>>> GetUniversityPlanBatch(YearAreaQuery query) public async Task<MessageModel<List<IdNameResult>>> 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<Func<T_Batchline, bool>> expression = Expressionable.Create<T_Batchline>() Expression<Func<T_Batchline, bool>> expression = Expressionable.Create<T_Batchline>()
.And(c => c.IsDelete == false) .And(c => c.IsDelete == false)
.And(c => c.AreaName == query.AreaName) .And(c => c.AreaName == query.AreaName)