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

更新显示信息

develop
old易 2024-05-24 15:14:29 +08:00
parent 7c404a7644
commit 0b7cd52f14
7 changed files with 125 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,6 +141,8 @@ namespace New_College.Api.Controllers.Front
{ {
typeinfo = s.VolunteerRemark.FromJson<List<VolteerItem>>(); typeinfo = s.VolunteerRemark.FromJson<List<VolteerItem>>();
} }
var planstatus = planmajordesc.Any(e => e.UniversityName == s.UniversityName);
var firstmodels = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault();
var uitem = new VolunteerTableDetailItemsView() var uitem = new VolunteerTableDetailItemsView()
{ {
@ -148,14 +150,14 @@ namespace New_College.Api.Controllers.Front
UniversityCode = s.UniversityCode, UniversityCode = s.UniversityCode,
Sort = s.OrderSort, Sort = s.OrderSort,
UniversityId = s.UniversityId, UniversityId = s.UniversityId,
_211 = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("211") ? "是" : "否" : "否" : "否", _211 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("211") ? "是" : "否" : "否" : "否",
_985 = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("985") ? "是" : "否" : "否" : "否", _985 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("985") ? "是" : "否" : "否" : "否",
_SYL = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("双一流") ? "是" : "否" : "否" : "否", _SYL = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("双一流") ? "是" : "否" : "否" : "否",
Ownership = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("省") ? "省属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("市") ? "市属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership : "", Ownership = planstatus ? firstmodels.Ownership != null ? firstmodels.Ownership.Contains("省") ? "省属" : firstmodels.Ownership.Contains("市") ? "市属" : firstmodels.Ownership : "" : "",
AreaName = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Province + "|" + (planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().City : "") : "", AreaName = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "",
Nature = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Nature : "", Nature = planstatus ? firstmodels.Nature != null ? firstmodels.Nature : "" : "",
Rank = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? (string.IsNullOrEmpty(planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().UniversityRank) ? "--" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().UniversityRank) : "--", Rank = planstatus ? (string.IsNullOrEmpty(firstmodels.UniversityRank) ? "--" : firstmodels.UniversityRank) : "--",
planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem() planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem()
{ {
@ -174,21 +176,21 @@ namespace New_College.Api.Controllers.Front
PlanItems = new List<PlanItem>() PlanItems = new List<PlanItem>()
{ {
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(c._23Count), PlanCount=c._23Count=="0"?"--":c._23Count,
RankLine=int.Parse(c._23ScoreLine), RankLine=c._23ScoreLine=="0"?"--":c._23ScoreLine,
Scoreline=int.Parse(c._23Score), Scoreline=c._23Score == "0" ? "--" : c._23Count,
Year="2023" Year="2023"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(c._22Count), PlanCount=c._22Count=="0"?"--":c._22Count,
RankLine=int.Parse(c._22ScoreLine), RankLine=c._22ScoreLine=="0"?"--":c._22ScoreLine,
Scoreline=int.Parse(c._22Score), Scoreline=c._22Score == "0" ? "--" : c._22Count,
Year="2022" Year="2022"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(c._21Count), PlanCount=c._21Count=="0"?"--":c._21Count,
RankLine=int.Parse(c._21ScoreLine), RankLine=c._21ScoreLine=="0"?"--":c._21ScoreLine,
Scoreline=int.Parse(c._21Score), Scoreline=c._21Score == "0" ? "--" : c._21Count,
Year="2021" Year="2021"
} } } }
}).ToList() }).ToList()

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

@ -69,9 +69,9 @@ namespace New_College.Controllers
//return d_LongIdMapServices.UpdateUniveristyInf(); //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 v_CustomerInfoServices.CustomeBillExport();
return true; return true;
} }

2
New_College.IServices/ID_LongIdMapServices.cs
View File

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

6
New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
View File

@ -364,17 +364,17 @@ namespace New_College.Model.ViewModels
public class PlanItem public class PlanItem
{ {
public string Year { get; set; } public string Year { get; set; }
public int PlanCount { get; set; } public string PlanCount { get; set; }
public string Count { get; set; } public string Count { get; set; }
/// <summary> /// <summary>
/// 位次 /// 位次
/// </summary> /// </summary>
public int RankLine { get; set; } public string RankLine { get; set; }
///// <summary> ///// <summary>
///// 最低分 ///// 最低分
///// </summary> ///// </summary>
public int Scoreline { get; set; } public string Scoreline { get; set; }
} }

29
New_College.Services/D_LongIdMapServices.cs
View File

@ -1975,12 +1975,12 @@ namespace New_College.Services
/// ///
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public async Task<bool> UpdateSchoolScoreLine23() public async Task<bool> UpdateSchoolScoreLine23(string Location)
{ {
var dsQualification = new List<D_QualificationLine>(); var dsQualification = new List<D_QualificationLine>();
var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == Location);
//var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); //var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省");
var universitylist = await d_UniversityRepository.Query(); var universitylist = await d_UniversityRepository.Query();
@ -2005,19 +2005,19 @@ namespace New_College.Services
// } // }
//}); //});
//await d_PlanMajorScoreLineRepository.BatchUpdate(list); //await d_PlanMajorScoreLineRepository.BatchUpdate(list);
var unlist = list.Select(c => c.UniversityName).Distinct().ToList(); var unlist = list.Select(c => c.UId).Distinct().ToList();
unlist.ForEach(a => unlist.ForEach(a =>
{ {
var models = list.Where(e => e.UniversityName == a).FirstOrDefault(); var models = list.Where(e => e.UId == a).FirstOrDefault();
//先找出院校最低分 //先找出院校最低分
var newmodel = new D_QualificationLine() var newmodel = new D_QualificationLine()
{ {
Years = models.Years, Years = models.Years,
UniversityName = a, UniversityName = models.UniversityName,
AreaName = universitylist.Where(c => c.Name == a).FirstOrDefault().Name, AreaName = universitylist.Where(c => c.Id == a).FirstOrDefault().Name,
EducationType = universitylist.Where(c => c.Name == a).FirstOrDefault().Subject_Level == 0 ? "本科" : "专科", EducationType = universitylist.Where(c => c.Id == a).FirstOrDefault().Subject_Level == 0 ? "本科" : "专科",
ModifyTime = DateTime.Now, ModifyTime = DateTime.Now,
Ownership = universitylist.Where(c => c.Name == a).FirstOrDefault().AscriptionName, Ownership = universitylist.Where(c => c.Id == a).FirstOrDefault().AscriptionName,
// RecruitCode = universitylist.Where(c => c.Name == a).FirstOrDefault().UniversityCode, // RecruitCode = universitylist.Where(c => c.Name == a).FirstOrDefault().UniversityCode,
RecruitType = "", RecruitType = "",
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
@ -2025,10 +2025,10 @@ namespace New_College.Services
Location = models.Location, Location = models.Location,
OrderSort = 0, OrderSort = 0,
UId = models.UId, UId = models.UId,
LowScore = list.Where(e => e.UniversityName == a).Select(c => c.LowScore).Min(), LowScore = list.Where(e => e.UId == a).Select(c => c.LowScore).Min(),
LowScoreRank = list.Where(e => e.UniversityName == a).Select(c => c.LowScoreRank).Max(), LowScoreRank = list.Where(e => e.UId == a).Select(c => c.LowScoreRank).Max(),
SubjectType = "综合", SubjectType = models.SubjectType,
BatchName = "普通批", BatchName = models.BatchName,
}; };
dsQualification.Add(newmodel); dsQualification.Add(newmodel);
// await d_QualificationLineRepository.Add(newmodel); // await d_QualificationLineRepository.Add(newmodel);
@ -2289,12 +2289,14 @@ namespace New_College.Services
var needlist = new List<T_TbSNeedDataInfo>(); var needlist = new List<T_TbSNeedDataInfo>();
var universitylist = await d_UniversityRepository.Query(); var universitylist = await d_UniversityRepository.Query();
var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == location); 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 == null && c.IsDelete == false); var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.BatchName == batchname && c.IsDelete == false);
var countid = (await this.t_TbSNeedDataInfoRepository.Query()).OrderByDescending(c => c.ID).FirstOrDefault().ID; var countid = (await this.t_TbSNeedDataInfoRepository.Query()).OrderByDescending(c => c.ID).FirstOrDefault().ID;
plist.ForEach(a => plist.ForEach(a =>
{ {
countid++; countid++;
var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault(); var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault();
if (u != null)
{
needlist.Add(new T_TbSNeedDataInfo() needlist.Add(new T_TbSNeedDataInfo()
{ {
ID = countid, ID = countid,
@ -2327,6 +2329,7 @@ namespace New_College.Services
_23SchoolScoreLine = 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).Select(c => c.LowScoreRank).Max().ToString() : "0", _23SchoolScoreLine = 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).Select(c => c.LowScoreRank).Max().ToString() : "0",
_23SchoolScore = 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).Select(c => c.LowScore).Min().ToString() : "0" _23SchoolScore = 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).Select(c => c.LowScore).Min().ToString() : "0"
}); });
}
}); });
var tt = needlist; var tt = needlist;

39
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -300,24 +300,23 @@ namespace New_College.Services
PlanItems = new List<PlanItem>() PlanItems = new List<PlanItem>()
{ {
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(t._23Count), PlanCount=t._23Count,
RankLine=int.Parse(t._23ScoreLine), RankLine=t._23ScoreLine,
Scoreline=int.Parse(t._23Score), Scoreline=t._23Score,
Year="2023" Year="2023"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(t._22Count), PlanCount=t._22Count,
RankLine=int.Parse(t._22ScoreLine), RankLine=t._22ScoreLine,
Scoreline=int.Parse(t._22Score), Scoreline=t._22Score,
Year="2022" Year="2022"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(t._21Count), PlanCount=t._21Count,
RankLine=int.Parse(t._21ScoreLine), RankLine=t._21ScoreLine,
Scoreline=int.Parse(t._21Score), Scoreline=t._21Score,
Year="2021" Year="2021"
}, } }
}
}).ToList(); }).ToList();
}); });
@ -414,21 +413,21 @@ namespace New_College.Services
PlanItems = new List<PlanItem>() PlanItems = new List<PlanItem>()
{ {
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(c._23Count), PlanCount=c._23Count,
RankLine=int.Parse(c._23ScoreLine), RankLine=c._23ScoreLine,
Scoreline=int.Parse(c._23Score), Scoreline=c._23Score,
Year="2023" Year="2023"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(c._22Count), PlanCount=c._22Count,
RankLine=int.Parse(c._22ScoreLine), RankLine=c._22ScoreLine,
Scoreline=int.Parse(c._22Score), Scoreline=c._22Score,
Year="2022" Year="2022"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(c._21Count), PlanCount=c._21Count,
RankLine=int.Parse(c._21ScoreLine), RankLine=c._21ScoreLine,
Scoreline=int.Parse(c._21Score), Scoreline=c._21Score,
Year="2021" Year="2021"
}, },
} }

21
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -617,24 +617,23 @@ namespace New_College.Services
planItems = new List<PlanItem>() planItems = new List<PlanItem>()
{ {
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(item._23Count), PlanCount=item._23Count,
RankLine=int.Parse(item._22ScoreLine), RankLine=item._23ScoreLine,
Scoreline=int.Parse(item._23Score), Scoreline=item._23Score,
Year="2023" Year="2023"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(item._22Count), PlanCount=item._22Count,
RankLine=int.Parse(item._22ScoreLine), RankLine=item._22ScoreLine,
Scoreline=int.Parse(item._22Score), Scoreline=item._22Score,
Year="2022" Year="2022"
}, },
new PlanItem() { new PlanItem() {
PlanCount=int.Parse(item._21Count), PlanCount=item._21Count,
RankLine=int.Parse(item._21ScoreLine), RankLine=item._21ScoreLine,
Scoreline=int.Parse(item._21Score), Scoreline=item._21Score,
Year="2021" Year="2021"
}, } }
}
}); });
} }
return new MessageModel<PageModel<PlanDescList>>() return new MessageModel<PageModel<PlanDescList>>()