diff --git a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs
index 11ca875..4cbfea7 100644
--- a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs
+++ b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs
@@ -75,8 +75,8 @@ namespace New_College.Api.Controllers
///
///
///
- [HttpGet]
- public async Task>> GetUniversityPlanPro([FromQuery] UniversityProViewQuery request)
+ [HttpPost]
+ public async Task>> GetUniversityPlanPro([FromBody] UniversityProViewQuery request)
{
var result = new PageModel();
if (string.IsNullOrWhiteSpace(request.Location))
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index 8e9a2fc..18e23db 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -6720,6 +6720,11 @@
学生所在省份
+
+
+ 年份
+
+
年份
@@ -6770,6 +6775,11 @@
选科组合
+
+
+ 学制
+
+
批次名称
diff --git a/New_College.Api/Startup.cs b/New_College.Api/Startup.cs
index c319d1b..5614cba 100644
--- a/New_College.Api/Startup.cs
+++ b/New_College.Api/Startup.cs
@@ -135,7 +135,7 @@ namespace New_College
//取消Unicode编码
options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
//忽略空值
- options.JsonSerializerOptions.IgnoreNullValues = true;
+ // options.JsonSerializerOptions.IgnoreNullValues = true;
//允许额外符号
options.JsonSerializerOptions.AllowTrailingCommas = true;
//反序列化过程中属性名称是否使用不区分大小写的比较
diff --git a/New_College.Model/ViewModels/Result/UniversityResult.cs b/New_College.Model/ViewModels/Result/UniversityResult.cs
index 577ef1d..b1ecd1d 100644
--- a/New_College.Model/ViewModels/Result/UniversityResult.cs
+++ b/New_College.Model/ViewModels/Result/UniversityResult.cs
@@ -6,6 +6,8 @@ namespace New_College.Model.ViewModels
{
public class UniversityResult
{
+
+ public string UniversityCode { get; set; }
///
/// 官网
///
diff --git a/New_College.Model/ViewModels/UniversityPlanProView.cs b/New_College.Model/ViewModels/UniversityPlanProView.cs
index c0597d1..7f5e3fa 100644
--- a/New_College.Model/ViewModels/UniversityPlanProView.cs
+++ b/New_College.Model/ViewModels/UniversityPlanProView.cs
@@ -135,6 +135,12 @@ namespace New_College.Model.ViewModels
///
public string SubjectClam { get; set; }
+
+ ///
+ /// 学制
+ ///
+ public string AcademicYear { get; set; }
+
///
/// 批次名称
///
diff --git a/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs b/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs
index 16e7175..2582db8 100644
--- a/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs
+++ b/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs
@@ -63,9 +63,11 @@ namespace New_College.Repository
_985 = c._985,
_211 = c._211,
_SYL = c._SYL,
+ Logo = "https://img1.youzy.cn/content/media/thumbs/p00189371.jpeg",
+ Web = "https://www.pku.edu.cn/",
UniversityType = c.SchoolType,
SubjectLevel = c.EducationCategory,
- Rank = c.Rank
+ Rank = string.IsNullOrEmpty(c.Rank) ? "9999" : c.Rank
})
.OrderBy(k => k.UId, OrderByType.Asc)
.ToPageListAsync(request.PageIndex, request.PageSize, totalCount);
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 281f9b5..3028200 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -365,7 +365,8 @@ namespace New_College.Services
DoctorateCount = university.Doctorate_Count,
MasterCount = university.Master_Count,
AcademicianCount = university.Academician_Count,
- Web = university.Web,
+ UniversityCode = "0001",
+ Web = string.IsNullOrEmpty(university.Web) ? "暂无" : university.Web,
// IsCollection = false,
Description = ClearHtmlHelper.SHTML(university.Description),
LongSchoolId = (await _dal.Query(x => x.IsDelete == false && x.table == "D_University" && x.newid == university.Id)).Select(x => x.longid).FirstOrDefault()
diff --git a/New_College.Services/D_PlanMajorDescProServices.cs b/New_College.Services/D_PlanMajorDescProServices.cs
index 42c8127..4d5b686 100644
--- a/New_College.Services/D_PlanMajorDescProServices.cs
+++ b/New_College.Services/D_PlanMajorDescProServices.cs
@@ -61,7 +61,8 @@ namespace New_College.Services
OldPlanCount = c.PlanCount + c.NewCount,
SubjectClam = c.SelectSubject,
Years = c.Years,
- OldYears = c.Years - 1
+ OldYears = c.Years - 1,
+ AcademicYear=c.AcademicYear
}).ToList();
return majorview;
}