diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index fec3c27..5ba6c9d 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -1054,7 +1054,7 @@ namespace New_College.Services PlanIds.AddRange(newids); } } - var descinfo = await _dal.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id)); + var descinfo = await _PlanMajorDescRepository.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id)); foreach (var item in info) { if (!string.IsNullOrWhiteSpace(item.PlanMajorIds)) @@ -1069,11 +1069,11 @@ namespace New_College.Services { var newinfos = nowdesc.Select(x => new PlanInfo() { - Money = x.Tuitionfee, - Year = x.Studyyears == null ? "-" : x.Studyyears == "" ? "-" : x.Studyyears, - PlanName = x.MajorName, - PlanNum = x.Plancount, - Scoreline = x.Scoreline + Money = x.Free, + Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(), + PlanName = x.Major, + PlanNum = x.PlanCount, + Scoreline = x.LowScore }).ToList(); count.FirstOrDefault().Infos.AddRange(newinfos); @@ -1091,12 +1091,11 @@ namespace New_College.Services Infos = nowdesc.Select(x => new PlanInfo() { - Money = x.Tuitionfee, - Year = x.Studyyears == null ? "-" : x.Studyyears == "" ? "-" : x.Studyyears, - YearName = yearname, - PlanName = x.MajorName, - PlanNum = x.Plancount, - Scoreline = x.Scoreline + Money = x.Free, + Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(), + PlanName = x.Major, + PlanNum = x.PlanCount, + Scoreline = x.LowScore }).ToList() }); } @@ -1205,7 +1204,7 @@ namespace New_College.Services //} var descinfo = await _PlanMajorDescRepository.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id)); - string yearName = (descinfo.FirstOrDefault().Years-1).ToString(); + string yearName = (descinfo.FirstOrDefault().Years - 1).ToString(); var universityids = query.details.Select(x => x.UniversityId).ToList(); var universityinfo = await d_UniversityRepository.Query(x => universityids.Contains(x.Id) && x.IsDelete == false, "Rank asc");