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

bug fixed

develop
liuyangyi 2024-07-13 22:23:47 +08:00
parent d2b24a77c5
commit e168d85e64
4 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,11 +74,11 @@ namespace New_College.Controllers
// 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;

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

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

2
New_College.IServices/ID_LongIdMapServices.cs
View File

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

117
New_College.Services/D_LongIdMapServices.cs
View File

@ -2453,13 +2453,13 @@ namespace New_College.Services
_plancount = a.PlanCount,
BatchName = a.BatchName,
SubjectType = subjectType,
_23ScoreLine = a.LowScoreRank,
_23Score = a.LowScore.ToString(),
//_23ScoreLine = a.LowScoreRank,
//_23Score = a.LowScore.ToString(),
_Score = a.LowScore.ToString(),
_24subject = 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",
// _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",
_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",
@ -2481,41 +2481,42 @@ namespace New_College.Services
/// 更新招生计划数据
/// </summary>
/// <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);
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location && e.BatchName == batchname);
var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
#region************************更新招生计划合计****************************
// 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 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 plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false);
//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=
// }
tbinfo.ForEach(o =>
{
//});
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************************更新招生计划合计****************************
@ -2650,38 +2651,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 && 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);
}
});
//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 更新专业分数先选科数据