bug fixed

develop
old易 2023-11-25 14:47:48 +08:00
parent e92eebef0d
commit 77e97d37a6
8 changed files with 28 additions and 6 deletions

View File

@ -75,8 +75,8 @@ namespace New_College.Api.Controllers
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpPost]
public async Task<MessageModel<PageModel<UniversityPlanProView>>> GetUniversityPlanPro([FromQuery] UniversityProViewQuery request) public async Task<MessageModel<PageModel<UniversityPlanProView>>> GetUniversityPlanPro([FromBody] UniversityProViewQuery request)
{ {
var result = new PageModel<UniversityPlanProView>(); var result = new PageModel<UniversityPlanProView>();
if (string.IsNullOrWhiteSpace(request.Location)) if (string.IsNullOrWhiteSpace(request.Location))

View File

@ -6720,6 +6720,11 @@
学生所在省份 学生所在省份
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.OldYears">
<summary>
年份
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.Years"> <member name="P:New_College.Model.ViewModels.MajorPlanProItemView.Years">
<summary> <summary>
年份 年份
@ -6770,6 +6775,11 @@
选科组合 选科组合
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.AcademicYear">
<summary>
学制
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.BatchName"> <member name="P:New_College.Model.ViewModels.MajorPlanProItemView.BatchName">
<summary> <summary>
批次名称 批次名称

View File

@ -135,7 +135,7 @@ namespace New_College
//取消Unicode编码 //取消Unicode编码
options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All); options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
//忽略空值 //忽略空值
options.JsonSerializerOptions.IgnoreNullValues = true; // options.JsonSerializerOptions.IgnoreNullValues = true;
//允许额外符号 //允许额外符号
options.JsonSerializerOptions.AllowTrailingCommas = true; options.JsonSerializerOptions.AllowTrailingCommas = true;
//反序列化过程中属性名称是否使用不区分大小写的比较 //反序列化过程中属性名称是否使用不区分大小写的比较

View File

@ -6,6 +6,8 @@ namespace New_College.Model.ViewModels
{ {
public class UniversityResult public class UniversityResult
{ {
public string UniversityCode { get; set; }
/// <summary> /// <summary>
/// 官网 /// 官网
/// </summary> /// </summary>

View File

@ -135,6 +135,12 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public string SubjectClam { get; set; } public string SubjectClam { get; set; }
/// <summary>
/// 学制
/// </summary>
public string AcademicYear { get; set; }
/// <summary> /// <summary>
/// 批次名称 /// 批次名称
/// </summary> /// </summary>

View File

@ -63,9 +63,11 @@ namespace New_College.Repository
_985 = c._985, _985 = c._985,
_211 = c._211, _211 = c._211,
_SYL = c._SYL, _SYL = c._SYL,
Logo = "https://img1.youzy.cn/content/media/thumbs/p00189371.jpeg",
Web = "https://www.pku.edu.cn/",
UniversityType = c.SchoolType, UniversityType = c.SchoolType,
SubjectLevel = c.EducationCategory, SubjectLevel = c.EducationCategory,
Rank = c.Rank Rank = string.IsNullOrEmpty(c.Rank) ? "9999" : c.Rank
}) })
.OrderBy(k => k.UId, OrderByType.Asc) .OrderBy(k => k.UId, OrderByType.Asc)
.ToPageListAsync(request.PageIndex, request.PageSize, totalCount); .ToPageListAsync(request.PageIndex, request.PageSize, totalCount);

View File

@ -365,7 +365,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,
Web = university.Web, UniversityCode = "0001",
Web = string.IsNullOrEmpty(university.Web) ? "暂无" : university.Web,
// IsCollection = false, // IsCollection = false,
Description = ClearHtmlHelper.SHTML(university.Description), 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() LongSchoolId = (await _dal.Query(x => x.IsDelete == false && x.table == "D_University" && x.newid == university.Id)).Select(x => x.longid).FirstOrDefault()

View File

@ -61,7 +61,8 @@ namespace New_College.Services
OldPlanCount = c.PlanCount + c.NewCount, OldPlanCount = c.PlanCount + c.NewCount,
SubjectClam = c.SelectSubject, SubjectClam = c.SelectSubject,
Years = c.Years, Years = c.Years,
OldYears = c.Years - 1 OldYears = c.Years - 1,
AcademicYear=c.AcademicYear
}).ToList(); }).ToList();
return majorview; return majorview;
} }