From fe93ce10897b4691e728ccac3e612e4f79b74b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 24 Oct 2023 17:37:46 +0800
Subject: [PATCH] bug fixed
---
New_College.Api/New_College.Model.xml | 45 +++++++++++++
.../ViewModels/Result/VolunteerTableResult.cs | 62 ++++++++++++++++-
.../T_EnrollmentPlanedescServices.cs | 67 +++++++++----------
3 files changed, 137 insertions(+), 37 deletions(-)
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index 6027bcb..ec96eff 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -5825,6 +5825,11 @@
志愿表详情
+
+
+
+
+
省市区名称
@@ -5835,11 +5840,51 @@
年份
+
+
+ 排名
+
+
+
+
+
+
+
+
+
+ 办学性质
+
+
+
+
+ 学历类别
+
+
+
+
+ 学校归属
+
+
+
+
+ 专业组
+
+
+
+
+ 学制
+
+
招生年份2021
+
+
+
+
+
志愿列表
diff --git a/New_College.Model/ViewModels/Result/VolunteerTableResult.cs b/New_College.Model/ViewModels/Result/VolunteerTableResult.cs
index 6a04146..1bfd206 100644
--- a/New_College.Model/ViewModels/Result/VolunteerTableResult.cs
+++ b/New_College.Model/ViewModels/Result/VolunteerTableResult.cs
@@ -11,6 +11,10 @@ namespace New_College.Model.ViewModels
{
public int UniversityId { get; set; }
+ ///
+ ///
+ ///
+ public string EnrollmentCode { get; set; }
public string UniversityName { get; set; }
///
/// 省市区名称
@@ -21,11 +25,53 @@ namespace New_College.Model.ViewModels
///
public int Year { get; set; }
+ ///
+ /// 排名
+ ///
+ public string Rank { get; set; }
+
+
+ public string _985 { get; set; }
+
+
+ public string _211 { get; set; }
+
+ ///
+ ///
+ ///
+ public string _SYL { get; set; }
+
+
+ ///
+ /// 办学性质
+ ///
+ public string Nature { get; set; }
+
+ ///
+ /// 学历类别
+ ///
+ public string EducationCategory { get; set; }
+
+
+
+
+ ///
+ /// 学校归属
+ ///
+ public string Ownership { get; set; }
+
+
public List Infos { get; set; }
}
public class PlanInfo
{
+
+ ///
+ /// 专业组
+ ///
+ public string MajorGroup { get; set; }
+ public string MajorCode { get; set; }
public int MajorId { get; set; }
public string PlanName { get; set; }
@@ -36,12 +82,24 @@ namespace New_College.Model.ViewModels
public string Money { get; set; }
+ ///
+ /// 学制
+ ///
+ public string AcademicYear { get; set; }
+
///
/// 招生年份2021
///
public string YearName { get; set; }
- public float Scoreline { get; set; }
+ public string Scoreline { get; set; }
+
+ public string LowScoreRank { get; set; }
+
+ ///
+ ///
+ ///
+ public string Remark { get; set; }
}
@@ -90,7 +148,7 @@ namespace New_College.Model.ViewModels
public string UniversityName { get; set; }
public string Province { get; set; }
-
+
///
/// 办学性质
///
diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs
index 712cc7b..8c13d21 100644
--- a/New_College.Services/T_EnrollmentPlanedescServices.cs
+++ b/New_College.Services/T_EnrollmentPlanedescServices.cs
@@ -559,7 +559,8 @@ namespace New_College.Services
YearName = query.Year.ToString(),
PlanName = x.Major,
PlanNum = x.PlanCount,
- Scoreline = x.LowScore
+ Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
+ LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString()
}).ToList(),
// AscriptionName = item.AscriptionName,
// Rank = item.Rank <= 0 ? "-" : item.Rank.ToString()
@@ -1067,42 +1068,35 @@ namespace New_College.Services
var nowdesc = descinfo.Where(x => planids.Contains(x.Id)).ToList();
if (nowdesc.Count <= 0)
continue;
- //此处处理针对于霍兰德推荐的具有相同学校的案例
- var count = list.Where(x => x.UniversityName == item.UniversityName).ToList();
- if (count.Count > 0)
+ string yearname = string.Empty;
+ if (query.CustomerId.HasValue)
{
- var newinfos = nowdesc.Select(x => new PlanInfo()
+ yearname = (await this._CustomerInfoRepository.QueryById(query.CustomerId)).Year.ToString();
+ }
+ list.Add(new VolunteerTableResult()
+ {
+ UniversityName = item.UniversityName,
+ EnrollmentCode = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId).EnrollmentCode,
+ Nature = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId).Nature,
+ Ownership = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId).Ownership,
+ _211 = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId)._211,
+ _985 = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId)._985,
+ _SYL = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId)._SYL,
+ Infos = nowdesc.Select(x => new PlanInfo()
{
Money = x.Free,
Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(),
PlanName = x.Major,
+ MajorCode = descinfo.FirstOrDefault(o => o.Id == x.Id).MajorCode,
+ MajorGroup = descinfo.FirstOrDefault(o => o.Id == x.Id).MajorGroup,
PlanNum = x.PlanCount,
- Scoreline = x.LowScore
- }).ToList();
- count.FirstOrDefault().Infos.AddRange(newinfos);
-
- }
- else
- {
- string yearname = string.Empty;
- if (query.CustomerId.HasValue)
- {
- yearname = (await this._CustomerInfoRepository.QueryById(query.CustomerId)).Year.ToString();
- }
- list.Add(new VolunteerTableResult()
- {
- UniversityName = item.UniversityName,
-
- Infos = nowdesc.Select(x => new PlanInfo()
- {
- Money = x.Free,
- Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(),
- PlanName = x.Major,
- PlanNum = x.PlanCount,
- Scoreline = x.LowScore
- }).ToList()
- });
- }
+ YearName = (x.Years - 1).ToString(),
+ Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
+ LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString(),
+ Remark = x.Remark,
+ AcademicYear = x.AcademicYear
+ }).ToList()
+ });
}
}
@@ -1234,7 +1228,8 @@ namespace New_College.Services
Year = x.AcademicYear,
PlanName = x.Major,
PlanNum = x.PlanCount,
- Scoreline = x.LowScore
+ Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
+ LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString()
}).ToList();
count.FirstOrDefault().Infos.AddRange(newinfos);
}
@@ -1258,7 +1253,8 @@ namespace New_College.Services
Year = x.AcademicYear,
PlanName = x.Major,
PlanNum = x.PlanCount,
- Scoreline = x.LowScore,
+ Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
+ LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString(),
YearName = yearName
}).ToList()
});
@@ -1316,7 +1312,8 @@ namespace New_College.Services
Year = x.Studyyears,
PlanName = x.MajorName,
PlanNum = x.Plancount,
- Scoreline = x.Scoreline
+ Scoreline = x.Scoreline == 0 ? "-" : x.Scoreline.ToString(),
+ LowScoreRank = x.scorepostion == 0 ? "-" : x.scorepostion.ToString()
}).ToList();
count.FirstOrDefault().Infos.AddRange(newinfos);
}
@@ -1338,7 +1335,7 @@ namespace New_College.Services
Year = x.Studyyears,
PlanName = x.MajorName,
PlanNum = x.Plancount,
- Scoreline = x.Scoreline
+ Scoreline = x.Scoreline == 0 ? "-" : x.Scoreline.ToString()
}).ToList()
});
}