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

合并冲突

develop
old易 2024-09-28 14:45:42 +08:00
parent 0a1a80e7cc e168d85e64
commit a1c2a559af
4 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ namespace New_College.Controllers
// await v_CustomerInfoServices.CustomeBillExport(); // await v_CustomerInfoServices.CustomeBillExport();
await d_LongIdMapServices.UpdatePlanProInf("山东省"); //await d_LongIdMapServices.UpdatePlanProInf("山东省", "普通类二段");
return true; return true;

6
New_College.Common/Helper/MajorPlanScoreTool.cs
View File

@ -33,10 +33,14 @@ namespace New_College.Common
{ {
percentage = new Random().Next(31, 80); percentage = new Random().Next(31, 80);
} }
if (LowScore >= requestScore && LowScore <= requestScore + 15) if (LowScore >= requestScore && LowScore <= requestScore + 30)
{ {
percentage = new Random().Next(1, 30); percentage = new Random().Next(1, 30);
} }
//else
//{
// percentage = new Random().Next(1, 30);
//}
return percentage; return percentage;
} }

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(string Location); Task<bool> UpdatePlanProInf(string Location, string batchname);
Task<bool> Import(); Task<bool> Import();
Task<bool> UpdateUniveristyInf(); Task<bool> UpdateUniveristyInf();

55
New_College.Services/D_LongIdMapServices.cs
View File

@ -2453,13 +2453,13 @@ namespace New_College.Services
_plancount = a.PlanCount, _plancount = a.PlanCount,
BatchName = a.BatchName, BatchName = a.BatchName,
SubjectType = subjectType, SubjectType = subjectType,
_23ScoreLine = a.LowScoreRank, //_23ScoreLine = a.LowScoreRank,
_23Score = a.LowScore.ToString(), //_23Score = a.LowScore.ToString(),
_Score = 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",
@ -2481,41 +2481,42 @@ namespace New_College.Services
/// 更新招生计划数据 /// 更新招生计划数据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public async Task<bool> UpdatePlanProInf(string Location) public async Task<bool> UpdatePlanProInf(string Location, string batchname)
{ {
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location && e.BatchName == "普通类二段"); var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location && e.BatchName == batchname);
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 == Location && e.Years == 2023); var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023);
// var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023); var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023);
// var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && 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();
// o.AcademicYear = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().AcademicYear;
// }
// if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
// {
// o._21Score = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
// o._21ScoreLine = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString();
// }
// if (qliylist.Any(e => e.UniversityName == o.UniversityName))
// {
// 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=
// }
//}); if (majorlist.Any(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName))
{
o._23Count = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString();
o._23Score = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
o._23ScoreLine = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank;
// o.AcademicYear = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().r;
}
//await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
if (majorlist.Any(e => e.UniversityName == o.UniversityName))
{
o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).Min(e=>e.LowScore).ToString();
o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).Max(e=>e.LowScoreRank).ToString();
//o._23SchoolAvgScore=
}
});
await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
#endregion************************更新招生计划合计**************************** #endregion************************更新招生计划合计****************************