bug fixed
parent
e92eebef0d
commit
77e97d37a6
|
|
@ -75,8 +75,8 @@ namespace New_College.Api.Controllers
|
|||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
public async Task<MessageModel<PageModel<UniversityPlanProView>>> GetUniversityPlanPro([FromQuery] UniversityProViewQuery request)
|
||||
[HttpPost]
|
||||
public async Task<MessageModel<PageModel<UniversityPlanProView>>> GetUniversityPlanPro([FromBody] UniversityProViewQuery request)
|
||||
{
|
||||
var result = new PageModel<UniversityPlanProView>();
|
||||
if (string.IsNullOrWhiteSpace(request.Location))
|
||||
|
|
|
|||
|
|
@ -6720,6 +6720,11 @@
|
|||
学生所在省份
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.OldYears">
|
||||
<summary>
|
||||
年份
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.Years">
|
||||
<summary>
|
||||
年份
|
||||
|
|
@ -6770,6 +6775,11 @@
|
|||
选科组合
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.AcademicYear">
|
||||
<summary>
|
||||
学制
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.BatchName">
|
||||
<summary>
|
||||
批次名称
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
//反序列化过程中属性名称是否使用不区分大小写的比较
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ namespace New_College.Model.ViewModels
|
|||
{
|
||||
public class UniversityResult
|
||||
{
|
||||
|
||||
public string UniversityCode { get; set; }
|
||||
/// <summary>
|
||||
/// 官网
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -135,6 +135,12 @@ namespace New_College.Model.ViewModels
|
|||
/// </summary>
|
||||
public string SubjectClam { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 学制
|
||||
/// </summary>
|
||||
public string AcademicYear { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 批次名称
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue