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

feat:bug fixed

develop
old易 2024-06-24 23:22:47 +08:00
parent 49c8eb9db2
commit 48134f4944
6 changed files with 100 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,13 +71,14 @@ namespace New_College.Controllers
//更新院校分数线 //更新院校分数线
// await d_LongIdMapServices.UpdateSchoolScoreLine23("河南省","理科"); // 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 v_CustomerInfoServices.CustomeBillExport();
await d_LongIdMapServices.UpdatePlanProInf(); await d_LongIdMapServices.UpdatePlanProInf("上海市");
return true; return true;
} }

2
New_College.IServices/ID_LongIdMapServices.cs
View File

@ -32,7 +32,7 @@ namespace New_College.IServices
/// <returns></returns> /// <returns></returns>
Task<bool> UpdatePlanScoreLine(); Task<bool> UpdatePlanScoreLine();
Task<bool> UpdateSchoolScoreLine23(string Location,string subjectType); Task<bool> UpdateSchoolScoreLine23(string Location,string subjectType);
Task<bool> UpdatePlanProInf(); Task<bool> UpdatePlanProInf(string Location);
Task<bool> Import(); Task<bool> Import();
Task<bool> UpdateUniveristyInf(); Task<bool> UpdateUniveristyInf();

2
New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs
View File

@ -63,6 +63,7 @@ namespace New_College.Model.ViewModels
public string _20ScoreLine { get; set; } public string _20ScoreLine { get; set; }
public int _plancount { get; set; }
public string AcademicYear { get; set; } public string AcademicYear { get; set; }
public string Fee { get; set; } public string Fee { get; set; }
@ -71,6 +72,7 @@ namespace New_College.Model.ViewModels
public string City { get; set; } public string City { get; set; }
public string Ownership { get; set; } public string Ownership { get; set; }
public string LnstitutionalLevel { get; set; } public string LnstitutionalLevel { get; set; }

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

@ -252,7 +252,7 @@ namespace New_College.Repository
} }
if (!string.IsNullOrWhiteSpace(query.SubjectClaim)) if (!string.IsNullOrWhiteSpace(query.SubjectClaim))
{ {
sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03,"不限"); sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03, "不限");
} }
sqlstr.Append(" order by _23ScoreLine "); sqlstr.Append(" order by _23ScoreLine ");
@ -310,7 +310,7 @@ namespace New_College.Repository
AscriptionName = recommendFirstModel.Ownership, AscriptionName = recommendFirstModel.Ownership,
CityName = recommendFirstModel.City, CityName = recommendFirstModel.City,
MjaorPlan = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Count(), MjaorPlan = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Count(),
planCount = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Sum(m => int.Parse(m._23Count)), planCount = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Sum(m => m._plancount),
PlanIds = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Select(c => c.ID).ToList(), PlanIds = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Select(c => c.ID).ToList(),
UniversityName = s.UniversityName UniversityName = s.UniversityName
}); });

157
New_College.Services/D_LongIdMapServices.cs
View File

@ -2451,11 +2451,14 @@ namespace New_College.Services
_plancount = a.PlanCount, _plancount = a.PlanCount,
BatchName = a.BatchName, BatchName = a.BatchName,
SubjectType = subjectType, SubjectType = subjectType,
_23ScoreLine = a.LowScoreRank.ToString(),
_23Score = a.LowScore.ToString(),
_Score = a.LowScore.ToString(),
_24subject = a.SelectSubject, _24subject = a.SelectSubject,
_23subject = a.SelectSubject, _23subject = a.SelectSubject,
_23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", _23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
_23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", // _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
_23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", // _23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
_22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", _22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
_22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", _22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
_22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", _22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
@ -2476,104 +2479,104 @@ namespace New_College.Services
/// 更新招生计划数据 /// 更新招生计划数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public async Task<bool> UpdatePlanProInf() public async Task<bool> UpdatePlanProInf(string Location)
{ {
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "河南省"); var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location);
var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false); var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false); // var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
#region************************更新招生计划合计**************************** #region************************更新招生计划合计****************************
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == "河南省" && e.Years == 2021); // var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023);
//var qliylist = await d_QualificationLineRepository.Query(e => e.Location == "河南省" && e.Years == 2022); // var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023);
//var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "河南省" && c.Years == 2021 && c.IsDelete == false); // var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false);
// tbinfo.ForEach(o => //tbinfo.ForEach(o =>
// {
//if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
//{ //{
// o._21Count = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString(); // if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
// // o.AcademicYear = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().AcademicYear; // {
//} // o._21Count = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString();
//if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) // o.AcademicYear = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().AcademicYear;
//{ // }
// o._21Score = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString(); // if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
// o._21ScoreLine = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString(); // {
//} // o._21Score = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
//if (qliylist.Any(e => e.UniversityName == o.UniversityName)) // o._21ScoreLine = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString();
//{ // }
// o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString(); // if (qliylist.Any(e => e.UniversityName == o.UniversityName))
// o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString(); // {
// //o._23SchoolAvgScore= // o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
//} // o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString();
// //o._23SchoolAvgScore=
// }
// }); //});
// await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); //await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
#endregion************************更新招生计划合计**************************** #endregion************************更新招生计划合计****************************
#region ***********************更新相关参数*************************** #region ***********************更新相关参数***************************
var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "河南省"); var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == "河南省"); var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location);
tbinfo.ForEach(o => tbinfo.ForEach(o =>
{ {
if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) //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._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))
//{ //{
// if (o._21Score == "0")
// 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; // 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";
// e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel; // 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";
// e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel; // 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";
// 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;
// } // }
// 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";
// }
// e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel; // if (o._23Score == "0")
// {
// e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree; // 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";
// e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor; // 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";
// 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;
//} //}
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.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.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;
}
}); });
await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
@ -2613,8 +2616,8 @@ namespace New_College.Services
#region 更新专业计划信息 #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 == 2024 && c.IsDelete == false);
//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 => //plist.ForEach(p =>
//{ //{
// //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault(); // //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault();

13
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -605,17 +605,24 @@ namespace New_College.Services
list.Add(new PlanDescList() list.Add(new PlanDescList()
{ {
Name = newname, Name = newname,
Year = "2023", Year = "2024",
Money = newmoney, Money = newmoney,
PlanNum = int.Parse(item._23Count), PlanNum = item._plancount,
MajorId = item.ID, MajorId = item.ID,
Scoreline = int.Parse(item._23ScoreLine), Scoreline = int.Parse(item._Score),
Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保 Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保
Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score), Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score),
Subject = item._23subject, Subject = item._23subject,
AcademicYear = item.AcademicYear, AcademicYear = item.AcademicYear,
planItems = new List<PlanItem>() planItems = new List<PlanItem>()
{ {
new PlanItem() {
PlanCount=item._plancount.ToString(),
RankLine="--",
Scoreline="--",
Year="2024"
},
new PlanItem() { new PlanItem() {
PlanCount=item._23Count, PlanCount=item._23Count,
RankLine=item._23ScoreLine, RankLine=item._23ScoreLine,