feat:bug fixed

develop
old易 2023-12-11 17:57:46 +08:00
parent 01130f3e55
commit daacde4a10
6 changed files with 21 additions and 4 deletions

View File

@ -143,6 +143,8 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public string UniversityCode { get; set; } public string UniversityCode { get; set; }
public string collegeCode { get; set; }
public string AreaName { get; set; } public string AreaName { get; set; }
public string _985 { get; set; } public string _985 { get; set; }
@ -253,6 +255,7 @@ namespace New_College.Model.ViewModels
/// 全国统一招生代码 /// 全国统一招生代码
/// </summary> /// </summary>
public string UniversityCode { get; set; } public string UniversityCode { get; set; }
public string collegeCode { get; set; }
public string AreaName { get; set; } public string AreaName { get; set; }

View File

@ -8,6 +8,7 @@ namespace New_College.Model.ViewModels
{ {
public string UniversityCode { get; set; } public string UniversityCode { get; set; }
/// <summary> /// <summary>
/// 官网 /// 官网
/// </summary> /// </summary>
@ -137,6 +138,11 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public float Scorepostion { get; set; } public float Scorepostion { get; set; }
/// <summary>
/// 原始code
/// </summary>
public string collegeCode { get; set; }
} }
/// <summary> /// <summary>

View File

@ -78,6 +78,8 @@ namespace New_College.Model.ViewModels
public string UniversityCode { get; set; } public string UniversityCode { get; set; }
public string collegeCode { get; set; }
public List<MajorPlanProItemView> itemViews { get; set; } public List<MajorPlanProItemView> itemViews { get; set; }

View File

@ -157,7 +157,8 @@ namespace New_College.Services
Name = c.Name, Name = c.Name,
Nature = c.Nature, Nature = c.Nature,
AscriptionName = c.AscriptionName, AscriptionName = c.AscriptionName,
UniversityCode = c.UniversityCode, UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.UniversityCode),
collegeCode = c.UniversityCode,
AreaName = c.Area_Name, AreaName = c.Area_Name,
AcademicianCount = c.Academician_Count, AcademicianCount = c.Academician_Count,
Address = c.Address, Address = c.Address,
@ -371,6 +372,8 @@ namespace New_College.Services
{ {
Id = university.Id, Id = university.Id,
Name = university.Name, Name = university.Name,
Address = university.Address,
Phone = university.Phone,
Nature = university.Nature, Nature = university.Nature,
AscriptionName = university.AscriptionName, AscriptionName = university.AscriptionName,
Rank = university.Rank, Rank = university.Rank,
@ -387,7 +390,8 @@ namespace New_College.Services
DoctorateCount = university.Doctorate_Count, DoctorateCount = university.Doctorate_Count,
MasterCount = university.Master_Count, MasterCount = university.Master_Count,
AcademicianCount = university.Academician_Count, AcademicianCount = university.Academician_Count,
UniversityCode =UniversityCodeConvertRules.UniversityCodeConvertRulesMap(university.UniversityCode), UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(university.UniversityCode),
collegeCode = university.UniversityCode,
Web = string.IsNullOrEmpty(university.Web) ? "暂无" : university.Web, Web = string.IsNullOrEmpty(university.Web) ? "暂无" : university.Web,
// IsCollection = false, // IsCollection = false,
Description = ClearHtmlHelper.SHTML(university.Description), Description = ClearHtmlHelper.SHTML(university.Description),

View File

@ -52,7 +52,7 @@ namespace New_College.Services
majorview.UId = view.UId; majorview.UId = view.UId;
majorview.UniversityName = view.Location; majorview.UniversityName = view.Location;
majorview.UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(view.EnrollmentCode); majorview.UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(view.EnrollmentCode);
majorview.collegeCode = view.EnrollmentCode;
majorview.itemViews = query.Select(c => new MajorPlanProItemView() majorview.itemViews = query.Select(c => new MajorPlanProItemView()
{ {
BatchName = c.BatchName, BatchName = c.BatchName,

View File

@ -107,6 +107,7 @@ namespace New_College.Services
UniversityId = c.UId, UniversityId = c.UId,
UniversityName = c.UniversityName, UniversityName = c.UniversityName,
UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.RecruitCode.ToString()), UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.RecruitCode.ToString()),
collegeCode = c.RecruitCode.ToString(),
LowScoreRank = c.LowScoreRank, LowScoreRank = c.LowScoreRank,
Ownership = c.Ownership, Ownership = c.Ownership,
//_fscore = c.LowScore, //_fscore = c.LowScore,
@ -260,7 +261,8 @@ namespace New_College.Services
Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//还缺冲稳保 Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//还缺冲稳保
Percentage = MajorPlanScoreTool.GetPlanPercentage(c.LowScore, request.Score), Percentage = MajorPlanScoreTool.GetPlanPercentage(c.LowScore, request.Score),
PlanId = c.Id, PlanId = c.Id,
UniversityCode =UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.EnrollmentCode), UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.EnrollmentCode),
collegeCode = c.EnrollmentCode,
MajorCode = c.MajorCode, MajorCode = c.MajorCode,
LowScoreRank = c.LowScoreRank, LowScoreRank = c.LowScoreRank,
PlanItems = list.Where(e => e.UId == c.UId && e.Major.Equals(c.Major)).Select(s => new PlanItem() PlanItems = list.Where(e => e.UId == c.UId && e.Major.Equals(c.Major)).Select(s => new PlanItem()