更新显示信息
parent
7c404a7644
commit
0b7cd52f14
|
|
@ -141,6 +141,8 @@ namespace New_College.Api.Controllers.Front
|
|||
{
|
||||
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()
|
||||
{
|
||||
|
||||
|
|
@ -148,14 +150,14 @@ namespace New_College.Api.Controllers.Front
|
|||
UniversityCode = s.UniversityCode,
|
||||
Sort = s.OrderSort,
|
||||
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") ? "是" : "否" : "否" : "否",
|
||||
_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") ? "是" : "否" : "否" : "否",
|
||||
_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("双一流") ? "是" : "否" : "否" : "否",
|
||||
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 : "",
|
||||
_211 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("211") ? "是" : "否" : "否" : "否",
|
||||
_985 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("985") ? "是" : "否" : "否" : "否",
|
||||
_SYL = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("双一流") ? "是" : "否" : "否" : "否",
|
||||
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 : "") : "",
|
||||
Nature = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().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) : "--",
|
||||
AreaName = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "",
|
||||
Nature = planstatus ? firstmodels.Nature != null ? firstmodels.Nature : "" : "",
|
||||
Rank = planstatus ? (string.IsNullOrEmpty(firstmodels.UniversityRank) ? "--" : firstmodels.UniversityRank) : "--",
|
||||
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>()
|
||||
{
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(c._23Count),
|
||||
RankLine=int.Parse(c._23ScoreLine),
|
||||
Scoreline=int.Parse(c._23Score),
|
||||
PlanCount=c._23Count=="0"?"--":c._23Count,
|
||||
RankLine=c._23ScoreLine=="0"?"--":c._23ScoreLine,
|
||||
Scoreline=c._23Score == "0" ? "--" : c._23Count,
|
||||
Year="2023"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(c._22Count),
|
||||
RankLine=int.Parse(c._22ScoreLine),
|
||||
Scoreline=int.Parse(c._22Score),
|
||||
PlanCount=c._22Count=="0"?"--":c._22Count,
|
||||
RankLine=c._22ScoreLine=="0"?"--":c._22ScoreLine,
|
||||
Scoreline=c._22Score == "0" ? "--" : c._22Count,
|
||||
Year="2022"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(c._21Count),
|
||||
RankLine=int.Parse(c._21ScoreLine),
|
||||
Scoreline=int.Parse(c._21Score),
|
||||
PlanCount=c._21Count=="0"?"--":c._21Count,
|
||||
RankLine=c._21ScoreLine=="0"?"--":c._21ScoreLine,
|
||||
Scoreline=c._21Score == "0" ? "--" : c._21Count,
|
||||
Year="2021"
|
||||
} }
|
||||
}).ToList()
|
||||
|
|
|
|||
|
|
@ -69,9 +69,9 @@ 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();
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ namespace New_College.IServices
|
|||
/// </summary>
|
||||
/// <returns></returns>
|
||||
Task<bool> UpdatePlanScoreLine();
|
||||
Task<bool> UpdateSchoolScoreLine23();
|
||||
Task<bool> UpdateSchoolScoreLine23(string Location);
|
||||
Task<bool> UpdatePlanProInf();
|
||||
Task<bool> Import();
|
||||
|
||||
|
|
|
|||
|
|
@ -364,17 +364,17 @@ namespace New_College.Model.ViewModels
|
|||
public class PlanItem
|
||||
{
|
||||
public string Year { get; set; }
|
||||
public int PlanCount { get; set; }
|
||||
public string PlanCount { get; set; }
|
||||
public string Count { get; set; }
|
||||
/// <summary>
|
||||
/// 位次
|
||||
/// </summary>
|
||||
public int RankLine { get; set; }
|
||||
public string RankLine { get; set; }
|
||||
|
||||
///// <summary>
|
||||
///// 最低分
|
||||
///// </summary>
|
||||
public int Scoreline { get; set; }
|
||||
public string Scoreline { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1975,12 +1975,12 @@ namespace New_College.Services
|
|||
///
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public async Task<bool> UpdateSchoolScoreLine23()
|
||||
public async Task<bool> UpdateSchoolScoreLine23(string Location)
|
||||
{
|
||||
|
||||
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 universitylist = await d_UniversityRepository.Query();
|
||||
|
|
@ -2005,30 +2005,30 @@ namespace New_College.Services
|
|||
// }
|
||||
//});
|
||||
//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 =>
|
||||
{
|
||||
var models = list.Where(e => e.UniversityName == a).FirstOrDefault();
|
||||
var models = list.Where(e => e.UId == a).FirstOrDefault();
|
||||
//先找出院校最低分
|
||||
var newmodel = new D_QualificationLine()
|
||||
{
|
||||
Years = models.Years,
|
||||
UniversityName = a,
|
||||
AreaName = universitylist.Where(c => c.Name == a).FirstOrDefault().Name,
|
||||
EducationType = universitylist.Where(c => c.Name == a).FirstOrDefault().Subject_Level == 0 ? "本科" : "专科",
|
||||
UniversityName = models.UniversityName,
|
||||
AreaName = universitylist.Where(c => c.Id == a).FirstOrDefault().Name,
|
||||
EducationType = universitylist.Where(c => c.Id == a).FirstOrDefault().Subject_Level == 0 ? "本科" : "专科",
|
||||
ModifyTime = DateTime.Now,
|
||||
Ownership = universitylist.Where(c => c.Name == a).FirstOrDefault().AscriptionName,
|
||||
// RecruitCode = universitylist.Where(c => c.Name == a).FirstOrDefault().UniversityCode,
|
||||
Ownership = universitylist.Where(c => c.Id == a).FirstOrDefault().AscriptionName,
|
||||
// RecruitCode = universitylist.Where(c => c.Name == a).FirstOrDefault().UniversityCode,
|
||||
RecruitType = "",
|
||||
CreateTime = DateTime.Now,
|
||||
IsDelete = false,
|
||||
Location = models.Location,
|
||||
OrderSort = 0,
|
||||
UId = models.UId,
|
||||
LowScore = list.Where(e => e.UniversityName == a).Select(c => c.LowScore).Min(),
|
||||
LowScoreRank = list.Where(e => e.UniversityName == a).Select(c => c.LowScoreRank).Max(),
|
||||
SubjectType = "综合",
|
||||
BatchName = "普通批",
|
||||
LowScore = list.Where(e => e.UId == a).Select(c => c.LowScore).Min(),
|
||||
LowScoreRank = list.Where(e => e.UId == a).Select(c => c.LowScoreRank).Max(),
|
||||
SubjectType = models.SubjectType,
|
||||
BatchName = models.BatchName,
|
||||
};
|
||||
dsQualification.Add(newmodel);
|
||||
// await d_QualificationLineRepository.Add(newmodel);
|
||||
|
|
@ -2289,44 +2289,47 @@ 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 == 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;
|
||||
plist.ForEach(a =>
|
||||
{
|
||||
countid++;
|
||||
var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault();
|
||||
needlist.Add(new T_TbSNeedDataInfo()
|
||||
if (u != null)
|
||||
{
|
||||
ID = countid,
|
||||
AcademicYear = a.AcademicYear,
|
||||
// City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name
|
||||
Province = u.Area_Name,
|
||||
EducationCategory = u.Subject_Level == 0 ? "本科" : "专科",
|
||||
EnrollmentCode = u.UniversityCode,
|
||||
Fee = a.Free,
|
||||
Location = a.Location,
|
||||
MajorCode = a.MajorCode,
|
||||
MajorName = a.Major,
|
||||
MastersDegree = u.Master_Count.ToString(),
|
||||
UniversityName = a.UniversityName,
|
||||
Ownership = u.AscriptionName,
|
||||
Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : "港澳台",
|
||||
Remark = a.Remark,
|
||||
PhDPoint = u.Doctorate_Count.ToString(),
|
||||
SubjectType = subjectType,
|
||||
_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",
|
||||
_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",
|
||||
_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",
|
||||
_21Count = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
|
||||
_21Score = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
|
||||
_21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.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"
|
||||
});
|
||||
needlist.Add(new T_TbSNeedDataInfo()
|
||||
{
|
||||
ID = countid,
|
||||
AcademicYear = a.AcademicYear,
|
||||
// City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name
|
||||
Province = u.Area_Name,
|
||||
EducationCategory = u.Subject_Level == 0 ? "本科" : "专科",
|
||||
EnrollmentCode = u.UniversityCode,
|
||||
Fee = a.Free,
|
||||
Location = a.Location,
|
||||
MajorCode = a.MajorCode,
|
||||
MajorName = a.Major,
|
||||
MastersDegree = u.Master_Count.ToString(),
|
||||
UniversityName = a.UniversityName,
|
||||
Ownership = u.AscriptionName,
|
||||
Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : "港澳台",
|
||||
Remark = a.Remark,
|
||||
PhDPoint = u.Doctorate_Count.ToString(),
|
||||
SubjectType = subjectType,
|
||||
_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",
|
||||
_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",
|
||||
_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",
|
||||
_21Count = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
|
||||
_21Score = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
|
||||
_21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.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"
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
var tt = needlist;
|
||||
|
|
|
|||
|
|
@ -299,25 +299,24 @@ namespace New_College.Services
|
|||
Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(t._23Score), request.Score),
|
||||
PlanItems = new List<PlanItem>()
|
||||
{
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(t._23Count),
|
||||
RankLine=int.Parse(t._23ScoreLine),
|
||||
Scoreline=int.Parse(t._23Score),
|
||||
Year="2023"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(t._22Count),
|
||||
RankLine=int.Parse(t._22ScoreLine),
|
||||
Scoreline=int.Parse(t._22Score),
|
||||
Year="2022"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(t._21Count),
|
||||
RankLine=int.Parse(t._21ScoreLine),
|
||||
Scoreline=int.Parse(t._21Score),
|
||||
Year="2021"
|
||||
},
|
||||
}
|
||||
new PlanItem() {
|
||||
PlanCount=t._23Count,
|
||||
RankLine=t._23ScoreLine,
|
||||
Scoreline=t._23Score,
|
||||
Year="2023"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=t._22Count,
|
||||
RankLine=t._22ScoreLine,
|
||||
Scoreline=t._22Score,
|
||||
Year="2022"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=t._21Count,
|
||||
RankLine=t._21ScoreLine,
|
||||
Scoreline=t._21Score,
|
||||
Year="2021"
|
||||
} }
|
||||
}).ToList();
|
||||
|
||||
});
|
||||
|
|
@ -413,23 +412,23 @@ namespace New_College.Services
|
|||
LowScore = int.Parse(c._23SchoolScore),
|
||||
PlanItems = new List<PlanItem>()
|
||||
{
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(c._23Count),
|
||||
RankLine=int.Parse(c._23ScoreLine),
|
||||
Scoreline=int.Parse(c._23Score),
|
||||
Year="2023"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(c._22Count),
|
||||
RankLine=int.Parse(c._22ScoreLine),
|
||||
Scoreline=int.Parse(c._22Score),
|
||||
Year="2022"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(c._21Count),
|
||||
RankLine=int.Parse(c._21ScoreLine),
|
||||
Scoreline=int.Parse(c._21Score),
|
||||
Year="2021"
|
||||
new PlanItem() {
|
||||
PlanCount=c._23Count,
|
||||
RankLine=c._23ScoreLine,
|
||||
Scoreline=c._23Score,
|
||||
Year="2023"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=c._22Count,
|
||||
RankLine=c._22ScoreLine,
|
||||
Scoreline=c._22Score,
|
||||
Year="2022"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=c._21Count,
|
||||
RankLine=c._21ScoreLine,
|
||||
Scoreline=c._21Score,
|
||||
Year="2021"
|
||||
},
|
||||
}
|
||||
}).ToList();
|
||||
|
|
|
|||
|
|
@ -616,25 +616,24 @@ namespace New_College.Services
|
|||
AcademicYear = item.AcademicYear,
|
||||
planItems = new List<PlanItem>()
|
||||
{
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(item._23Count),
|
||||
RankLine=int.Parse(item._22ScoreLine),
|
||||
Scoreline=int.Parse(item._23Score),
|
||||
Year="2023"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(item._22Count),
|
||||
RankLine=int.Parse(item._22ScoreLine),
|
||||
Scoreline=int.Parse(item._22Score),
|
||||
Year="2022"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=int.Parse(item._21Count),
|
||||
RankLine=int.Parse(item._21ScoreLine),
|
||||
Scoreline=int.Parse(item._21Score),
|
||||
Year="2021"
|
||||
},
|
||||
}
|
||||
new PlanItem() {
|
||||
PlanCount=item._23Count,
|
||||
RankLine=item._23ScoreLine,
|
||||
Scoreline=item._23Score,
|
||||
Year="2023"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=item._22Count,
|
||||
RankLine=item._22ScoreLine,
|
||||
Scoreline=item._22Score,
|
||||
Year="2022"
|
||||
},
|
||||
new PlanItem() {
|
||||
PlanCount=item._21Count,
|
||||
RankLine=item._21ScoreLine,
|
||||
Scoreline=item._21Score,
|
||||
Year="2021"
|
||||
} }
|
||||
});
|
||||
}
|
||||
return new MessageModel<PageModel<PlanDescList>>()
|
||||
|
|
|
|||
Loading…
Reference in New Issue