From daacde4a104efe2c6a282654211e914813dd85e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Mon, 11 Dec 2023 17:57:46 +0800
Subject: [PATCH] feat:bug fixed
---
New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs | 3 +++
New_College.Model/ViewModels/Result/UniversityResult.cs | 6 ++++++
New_College.Model/ViewModels/UniversityPlanProView.cs | 2 ++
New_College.Services/D_LongIdMapServices.cs | 8 ++++++--
New_College.Services/D_PlanMajorDescProServices.cs | 2 +-
New_College.Services/D_PlanMajorDescServices.cs | 4 +++-
6 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
index 8c1157f..df5285c 100644
--- a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
+++ b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
@@ -143,6 +143,8 @@ namespace New_College.Model.ViewModels
///
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
/// 全国统一招生代码
///
public string UniversityCode { get; set; }
+ public string collegeCode { get; set; }
public string AreaName { get; set; }
diff --git a/New_College.Model/ViewModels/Result/UniversityResult.cs b/New_College.Model/ViewModels/Result/UniversityResult.cs
index 1bbe37b..0a6945c 100644
--- a/New_College.Model/ViewModels/Result/UniversityResult.cs
+++ b/New_College.Model/ViewModels/Result/UniversityResult.cs
@@ -8,6 +8,7 @@ namespace New_College.Model.ViewModels
{
public string UniversityCode { get; set; }
+
///
/// 官网
///
@@ -137,6 +138,11 @@ namespace New_College.Model.ViewModels
///
public float Scorepostion { get; set; }
+ ///
+ /// 原始code
+ ///
+ public string collegeCode { get; set; }
+
}
///
diff --git a/New_College.Model/ViewModels/UniversityPlanProView.cs b/New_College.Model/ViewModels/UniversityPlanProView.cs
index e698f8e..6b52b0e 100644
--- a/New_College.Model/ViewModels/UniversityPlanProView.cs
+++ b/New_College.Model/ViewModels/UniversityPlanProView.cs
@@ -78,6 +78,8 @@ namespace New_College.Model.ViewModels
public string UniversityCode { get; set; }
+ public string collegeCode { get; set; }
+
public List itemViews { get; set; }
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 811cec8..e39915c 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -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),
diff --git a/New_College.Services/D_PlanMajorDescProServices.cs b/New_College.Services/D_PlanMajorDescProServices.cs
index 174dd54..74227dc 100644
--- a/New_College.Services/D_PlanMajorDescProServices.cs
+++ b/New_College.Services/D_PlanMajorDescProServices.cs
@@ -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,
diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs
index 248f44a..ac823ce 100644
--- a/New_College.Services/D_PlanMajorDescServices.cs
+++ b/New_College.Services/D_PlanMajorDescServices.cs
@@ -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()