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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
New_College.Model/ViewModels/Result/UniversityResult.cs
View File

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

2
New_College.Model/ViewModels/UniversityPlanProView.cs
View File

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

8
New_College.Services/D_LongIdMapServices.cs
View File

@ -157,7 +157,8 @@ namespace New_College.Services
Name = c.Name,
Nature = c.Nature,
AscriptionName = c.AscriptionName,
UniversityCode = c.UniversityCode,
UniversityCode = UniversityCodeConvertRules.UniversityCodeConvertRulesMap(c.UniversityCode),
collegeCode = c.UniversityCode,
AreaName = c.Area_Name,
AcademicianCount = c.Academician_Count,
Address = c.Address,
@ -371,6 +372,8 @@ namespace New_College.Services
{
Id = university.Id,
Name = university.Name,
Address = university.Address,
Phone = university.Phone,
Nature = university.Nature,
AscriptionName = university.AscriptionName,
Rank = university.Rank,
@ -387,7 +390,8 @@ namespace New_College.Services
DoctorateCount = university.Doctorate_Count,
MasterCount = university.Master_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,
// IsCollection = false,
Description = ClearHtmlHelper.SHTML(university.Description),

2
New_College.Services/D_PlanMajorDescProServices.cs
View File

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

4
New_College.Services/D_PlanMajorDescServices.cs
View File

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