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

bug fixed

develop
old易 2024-06-04 16:59:31 +08:00
parent 0b7cd52f14
commit 29c32058af
3 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -178,19 +178,19 @@ namespace New_College.Api.Controllers.Front
new PlanItem() {
PlanCount=c._23Count=="0"?"--":c._23Count,
RankLine=c._23ScoreLine=="0"?"--":c._23ScoreLine,
Scoreline=c._23Score == "0" ? "--" : c._23Count,
Scoreline=c._23Score == "0" ? "--" : c._23Score,
Year="2023"
},
new PlanItem() {
PlanCount=c._22Count=="0"?"--":c._22Count,
RankLine=c._22ScoreLine=="0"?"--":c._22ScoreLine,
Scoreline=c._22Score == "0" ? "--" : c._22Count,
Scoreline=c._22Score == "0" ? "--" : c._22Score,
Year="2022"
},
new PlanItem() {
PlanCount=c._21Count=="0"?"--":c._21Count,
RankLine=c._21ScoreLine=="0"?"--":c._21ScoreLine,
Scoreline=c._21Score == "0" ? "--" : c._21Count,
Scoreline=c._21Score == "0" ? "--" : c._21Score,
Year="2021"
} }
}).ToList()

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

@ -69,10 +69,12 @@ namespace New_College.Controllers
//return d_LongIdMapServices.UpdateUniveristyInf();
//更新院校分数线
//await d_LongIdMapServices.UpdateSchoolScoreLine23("四川省");
//await d_LongIdMapServices.UpdateSchoolScoreLine23("四川省");
await d_LongIdMapServices.PlanNeedProSync("四川省", 2023, "理科", "本科二批");
await d_LongIdMapServices.PlanNeedProSync("四川省", 2023, "文科", "专科");
// await v_CustomerInfoServices.CustomeBillExport();
//await d_LongIdMapServices.UpdatePlanProInf();
return true;
}

126
New_College.Services/D_LongIdMapServices.cs
View File

@ -2289,7 +2289,7 @@ namespace New_College.Services
var needlist = new List<T_TbSNeedDataInfo>();
var universitylist = await d_UniversityRepository.Query();
var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == location);
var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.BatchName == batchname && c.IsDelete == false);
var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.SubjectType == subjectType && c.BatchName == batchname && c.IsDelete == false);
var countid = (await this.t_TbSNeedDataInfoRepository.Query()).OrderByDescending(c => c.ID).FirstOrDefault().ID;
plist.ForEach(a =>
{
@ -2312,7 +2312,7 @@ namespace New_College.Services
MastersDegree = u.Master_Count.ToString(),
UniversityName = a.UniversityName,
Ownership = u.AscriptionName,
Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : "港澳台",
Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : u.Nature == 3 ? "港澳台" : "独立学院",
Remark = a.Remark,
PhDPoint = u.Doctorate_Count.ToString(),
SubjectType = subjectType,
@ -2343,9 +2343,9 @@ namespace New_College.Services
public async Task<bool> UpdatePlanProInf()
{
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "河南省");
var universitylist = await d_UniversityRepository.Query();
var majorlist = await d_MajorRepository.Query();
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "四川省");
//var universitylist = await d_UniversityRepository.Query();
//var majorlist = await d_MajorRepository.Query();
@ -2355,9 +2355,7 @@ namespace New_College.Services
#region************************更新招生计划合计****************************
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == "河南省" && e.Years == 2021);
//var qliylist = await d_QualificationLineRepository.Query(e => e.Location == "河南省" && e.Years == 2022);
//var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "河南省" && c.Years == 2021 && c.IsDelete == false);
// tbinfo.ForEach(o =>
@ -2389,43 +2387,43 @@ namespace New_College.Services
#region ***********************更新相关参数***************************
//var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
//tbinfo.ForEach(e =>
//{
tbinfo.ForEach(e =>
{
// if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName))
// {
if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName))
{
// 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;
// e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel;
// e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel;
// 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;
// }
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;
e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel;
e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel;
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;
}
// e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel;
e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel;
// e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree;
// e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor;
e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree;
e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor;
// 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;
// }
//});
//await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
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;
}
});
await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
#endregion
@ -2434,33 +2432,33 @@ namespace New_College.Services
#region 院校专业关联
var models = new List<D_MajorMapUniversity>();
tbinfo.ForEach(async a =>
{
if (universitylist.Where(e => e.Name == a.UniversityName).Any())
{
if (majorlist.Where(e => a.MajorName.Contains(e.Name)).Any())
{
var mid = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id;
var uid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id;
if (!models.Where(e => e.Universityid == uid && e.MajorId == mid).Any())
{
if (!(await d_MajorMapUniversityRepository.Query(q => q.Universityid == uid && q.MajorId == mid)).Any())
models.Add(new D_MajorMapUniversity()
{
CreateTime = DateTime.UtcNow,
IsDelete = false,
ModifyTime = DateTime.UtcNow,
OrderSort = 0,
sp = 0,
MajorId = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id,
Universityid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id
});
}
}
}
});
await d_MajorMapUniversityRepository.Add(models);
//var models = new List<D_MajorMapUniversity>();
//tbinfo.ForEach(async a =>
//{
// if (universitylist.Where(e => e.Name == a.UniversityName).Any())
// {
// if (majorlist.Where(e => a.MajorName.Contains(e.Name)).Any())
// {
// var mid = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id;
// var uid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id;
// if (!models.Where(e => e.Universityid == uid && e.MajorId == mid).Any())
// {
// if (!(await d_MajorMapUniversityRepository.Query(q => q.Universityid == uid && q.MajorId == mid)).Any())
// models.Add(new D_MajorMapUniversity()
// {
// CreateTime = DateTime.UtcNow,
// IsDelete = false,
// ModifyTime = DateTime.UtcNow,
// OrderSort = 0,
// sp = 0,
// MajorId = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id,
// Universityid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id
// });
// }
// }
// }
//});
//await d_MajorMapUniversityRepository.Add(models);
#endregion