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

bug fixed

develop
old易 2024-07-10 15:15:13 +08:00
parent 128b2ff4d3
commit c6b52dab7d
4 changed files with 128 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
New_College.Api/Controllers/HealthCheckController.cs
View File

@ -72,13 +72,13 @@ namespace New_College.Controllers
//更新院校分数线
// await d_LongIdMapServices.UpdateSchoolScoreLine23("河南省","理科");
// await d_LongIdMapServices.PlanNeedProSync("上海市", 2024, "综合", "本科");
// 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;

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

@ -254,8 +254,14 @@ namespace New_College.Repository
{
sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03, "不限");
}
sqlstr.Append("and _23ScoreLine>0 order by _23ScoreLine ");
if (query.BatchName == "普通类二段" || query.BatchName.Contains("专科"))
{
sqlstr.AppendLine(" or _23Score <=0 and EducationCategory='专科' order by _23ScoreLine ");
}
else
{
sqlstr.Append("and _23ScoreLine>0 order by _23ScoreLine ");
}
var recommendInfo = await this.Db.SqlQueryable<TbSNeedDataInfoViewDto>(sqlstr.ToString()).ToListAsync();

218
New_College.Services/D_LongIdMapServices.cs
View File

@ -2484,7 +2484,7 @@ namespace New_College.Services
public async Task<bool> UpdatePlanProInf(string Location)
{
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location);
//var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location);
var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
@ -2525,93 +2525,93 @@ namespace New_College.Services
// 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";
// }
//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";
// }
// 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 = 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 = 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))
//{
//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 +2650,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);
//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 更新专业分数先选科数据

11
New_College.Services/T_TbSNeedDataInfoPevServices.cs
View File

@ -96,12 +96,17 @@ namespace New_College.Services
sbsql.AppendFormat(" and '{0}' like '%Nature%'", request.Nature);
}
if (request.EndScore > request.StartScore)
{
sbsql.AppendFormat(" and (_23Score BETWEEN {0} and {1})", request.Score - 60, request.Score + 15);
int start = request.Score - 60;
if (request.BatchName == "普通类二段" || request.BatchName.Contains("专科"))
{ start = request.Score - 100; }
sbsql.AppendFormat(" and (_23Score BETWEEN {0} and {1})", start, request.Score + 15);
}
if (request.BatchName == "普通类二段" || request.BatchName.Contains("专科"))
{
sbsql.AppendLine(" or _23Score <=0 and EducationCategory='专科'");
}
var list = await _dal.QuerySql(sbsql.ToString());
return list;
}