yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

develop
old易 2024-06-25 11:49:01 +08:00
parent 48134f4944
commit ac2530a195
11 changed files with 191 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -184,7 +184,7 @@ namespace New_College.Api.Controllers.Front
{ {
new PlanItem() { new PlanItem() {
PlanCount=c._23Count=="0"?"--":c._23Count, PlanCount=c._23Count=="0"?"--":c._23Count,
RankLine=c._23ScoreLine=="0"?"--":c._23ScoreLine, RankLine=c._23ScoreLine==0?"--":c._23ScoreLine.ToString(),
Scoreline=c._23Score == "0" ? "--" : c._23Score, Scoreline=c._23Score == "0" ? "--" : c._23Score,
Year="2023" Year="2023"
}, },
@ -278,7 +278,7 @@ namespace New_College.Api.Controllers.Front
_21Scoreline = a._21Score == "0" ? "--" : a._21Score, _21Scoreline = a._21Score == "0" ? "--" : a._21Score,
_22RankLine = a._22ScoreLine == "0" ? "--" : a._22ScoreLine, _22RankLine = a._22ScoreLine == "0" ? "--" : a._22ScoreLine,
_22Scoreline = a._22Score == "0" ? "--" : a._22Score, _22Scoreline = a._22Score == "0" ? "--" : a._22Score,
_23RankLine = a._23ScoreLine == "0" ? "--" : a._23ScoreLine, _23RankLine = a._23ScoreLine == 0? "--" : a._23ScoreLine.ToString(),
_23Scoreline = a._23Score == "0" ? "--" : a._23Score, _23Scoreline = a._23Score == "0" ? "--" : a._23Score,
}); });
}); });

2
New_College.Api/Controllers/HealthCheckController.cs
View File

@ -73,7 +73,7 @@ namespace New_College.Controllers
// await d_LongIdMapServices.PlanNeedProSync("上海市", 2024, "综合", "本科"); // await d_LongIdMapServices.PlanNeedProSync("上海市", 2024, "综合", "本科");
// await d_LongIdMapServices.SyncnewNeedProSData("上海市", 2024, "综合", "本科"); //await d_LongIdMapServices.SyncnewNeedProSData("上海市", 2024, "综合", "本科");
// await v_CustomerInfoServices.CustomeBillExport(); // await v_CustomerInfoServices.CustomeBillExport();

97
New_College.Api/New_College.Model.xml
View File

@ -2757,6 +2757,11 @@
招生类型 招生类型
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.BatchName">
<summary>
batchName
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo.EnrollmentCode"> <member name="P:New_College.Model.Models.T_TbSNeedDataInfo.EnrollmentCode">
<summary> <summary>
全国统一招生代码 全国统一招生代码
@ -2802,6 +2807,11 @@
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._plancount">
<summary>
最新招生人数
</summary>
</member>
<member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23Count"> <member name="P:New_College.Model.Models.T_TbSNeedDataInfo._23Count">
<summary> <summary>
@ -3479,6 +3489,11 @@
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Request.SelectionRequest.LocationCode">
<summary>
这里
</summary>
</member>
<member name="P:New_College.Model.SyncUpdateStudentInfoDto.Status"> <member name="P:New_College.Model.SyncUpdateStudentInfoDto.Status">
<summary> <summary>
状态：0、未启用，1、启用，2、禁用 状态：0、未启用，1、启用，2、禁用
@ -7920,6 +7935,88 @@
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.UniversityName">
<summary>
院校名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.UniversityCode">
<summary>
院校编码
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.AreaName">
<summary>
学校所在地区
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.Nature">
<summary>
公办|民办
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.MajorCode">
<summary>
专业代码
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.MajorGroup">
<summary>
专业组
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.Major">
<summary>
专业名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.MajorSubjectClam">
<summary>
专业选科
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.planCount">
<summary>
计划数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.fee">
<summary>
学费
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr._23RankLine">
<summary>
位次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr._22RankLine">
<summary>
位次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr._21RankLine">
<summary>
位次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerExcelAttrModel.VolunteerTableName">
<summary>
志愿表名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerExcelAttrModel.Type">
<summary>
志愿填报类型（智能填报|一键填报）
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerExcelAttrModel.SubjectClaim">
<summary>
选科科目
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTablePlanMajorItem.planCount"> <member name="P:New_College.Model.ViewModels.VolunteerTablePlanMajorItem.planCount">
<summary> <summary>
计划数 计划数

7
New_College.Api/New_College.xml
View File

@ -399,6 +399,13 @@
<param name="request"></param> <param name="request"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:New_College.Api.Controllers.Front.FrontSelectionController.GetSelect(New_College.Model.Request.SelectionRequest)">
<summary>
获取选科数据结果
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.GetSameScoreLine(New_College.Model.ViewModels.ScoreLineQueryDto)"> <member name="M:New_College.Api.Controllers.Front.LibraryController.GetSameScoreLine(New_College.Model.ViewModels.ScoreLineQueryDto)">
<summary> <summary>
同分年份数据 同分年份数据

2
New_College.Common/Helper/MajorPlanScoreTool.cs
View File

@ -57,7 +57,7 @@ namespace New_College.Common
{ {
type = 1; type = 1;
} }
if (LowScore >= requestScore && LowScore <= requestScore + 15) if (LowScore >= requestScore && LowScore <= requestScore + 30)
{ {
type = 2; type = 2;
} }

2
New_College.Model/Models/T_TbSNeedDataInfo.cs
View File

@ -101,7 +101,7 @@ namespace New_College.Model.Models
/// ///
/// </summary> /// </summary>
[SugarColumn(ColumnName = "_23ScoreLine")] [SugarColumn(ColumnName = "_23ScoreLine")]
public string _23ScoreLine { get; set; } public int _23ScoreLine { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

4
New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
View File

@ -254,7 +254,7 @@ namespace New_College.Repository
{ {
sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03, "不限"); sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03, "不限");
} }
sqlstr.Append(" order by _23ScoreLine "); sqlstr.Append("and _23ScoreLine>0 order by _23ScoreLine ");
var recommendInfo = await this.Db.SqlQueryable<TbSNeedDataInfoViewDto>(sqlstr.ToString()).ToListAsync(); var recommendInfo = await this.Db.SqlQueryable<TbSNeedDataInfoViewDto>(sqlstr.ToString()).ToListAsync();
@ -324,7 +324,7 @@ namespace New_College.Repository
msg = "获取成功", msg = "获取成功",
response = new PageModel<UniversityEnrollmentPlanResult>() response = new PageModel<UniversityEnrollmentPlanResult>()
{ {
data = ulist.OrderBy(t => t.Percentage).OrderBy(t => t.SchoolScoreline).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList(), data = ulist.OrderByDescending(t => t.Type).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList(),
dataCount = universitylist.Count, dataCount = universitylist.Count,
page = query.PageIndex, page = query.PageIndex,
PageSize = query.PageSize, PageSize = query.PageSize,

101
New_College.Services/D_LongIdMapServices.cs
View File

@ -2433,7 +2433,7 @@ namespace New_College.Services
{ {
ID = countid, ID = countid,
AcademicYear = a.AcademicYear, AcademicYear = a.AcademicYear,
EnrollmentType= "普通计划", EnrollmentType = "普通计划",
// City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name // City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name
Province = u.Area_Name, Province = u.Area_Name,
EducationCategory = u.Subject_Level == 0 ? "本科" : "专科", EducationCategory = u.Subject_Level == 0 ? "本科" : "专科",
@ -2451,14 +2451,14 @@ namespace New_College.Services
_plancount = a.PlanCount, _plancount = a.PlanCount,
BatchName = a.BatchName, BatchName = a.BatchName,
SubjectType = subjectType, SubjectType = subjectType,
_23ScoreLine = a.LowScoreRank.ToString(), _23ScoreLine = a.LowScoreRank,
_23Score = a.LowScore.ToString(), _23Score = a.LowScore.ToString(),
_Score = a.LowScore.ToString(), _Score = a.LowScore.ToString(),
_24subject = a.SelectSubject, _24subject = a.SelectSubject,
_23subject = a.SelectSubject, _23subject = a.SelectSubject,
_23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", _23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
// _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", // _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
// _23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", // _23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
_22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0", _22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
_22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0", _22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
_22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0", _22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
@ -2482,15 +2482,15 @@ namespace New_College.Services
public async Task<bool> UpdatePlanProInf(string Location) public async Task<bool> UpdatePlanProInf(string Location)
{ {
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location); var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location);
var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false); var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false); // var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
#region************************更新招生计划合计**************************** #region************************更新招生计划合计****************************
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023); // var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023);
// var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023); // var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023);
// var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false); // var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false);
//tbinfo.ForEach(o => //tbinfo.ForEach(o =>
//{ //{
// if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) // if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
@ -2520,8 +2520,9 @@ namespace New_College.Services
#region ***********************更新相关参数*************************** #region ***********************更新相关参数***************************
var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省"); // var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location); //var pronew = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Location == Location && e.Years == 2024 && e.BatchName == "本科");
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location);
tbinfo.ForEach(o => tbinfo.ForEach(o =>
{ {
//if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName)) //if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
@ -2547,36 +2548,66 @@ namespace New_College.Services
// o._23Count = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0"; // o._23Count = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
// } // }
//} //}
if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName)) //o._23Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString();
//o._23ScoreLine = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScoreRank;
//o._Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString();
//if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName))
//{
//o.UniversityRank = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().UniversityRank;
//o.City = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().City;
//o.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EmploymentQuality;
//o.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EnrollmentCode;
//if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)))
//{
// o.Fee = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().Fee;
// o.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().MjaorLevel;
// o.MajorCount = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel;
// o.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel;
// o.FirstType = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().FirstType;
//}
// o.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().LnstitutionalLevel;
//o.MastersDegree = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersDegree;
//o.MastersMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersMajor;
//o.Nature = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Nature;
//o.Ownership = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Ownership;
//o.PhDMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDMajor;
//o.PhDPoint = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDPoint;
//o.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().ProfessionalAssessment;
//o.Province = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Province;
//o.VRUrl = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().VRUrl;
// }
if (universitylist.Any(e => e.Name == o.UniversityName))
{ {
o.UniversityRank = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().UniversityRank; if (string.IsNullOrWhiteSpace(o.LnstitutionalLevel))
o.City = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().City;
o.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().EmploymentQuality;
o.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().EnrollmentCode;
if (tbsdinfo.Any(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)))
{ {
o.Fee = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().Fee; string str = string.Empty;
o.MjaorLevel = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().MjaorLevel; if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Nhef > 0)
o.MajorCount = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel; {
o.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel; str += "985/";
o.FirstType = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().FirstType; }
if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Sff > 0)
{
str += "211/";
}
if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Syl > 0)
{
str += "双一流/";
}
if (str.Contains("985") && str.Contains("211"))
{
str += "保研资格/";
}
o.LnstitutionalLevel = str;
} }
o.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().LnstitutionalLevel;
o.MastersDegree = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().MastersDegree;
o.MastersMajor = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().MastersMajor;
o.Nature = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().Nature;
o.Ownership = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().Ownership;
o.PhDMajor = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().PhDMajor;
o.PhDPoint = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().PhDPoint;
o.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().ProfessionalAssessment;
o.Province = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().Province;
o.VRUrl = tbsdinfo.Where(a => a.UniversityName ==o.UniversityName).FirstOrDefault().VRUrl;
} }
}); });
await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo); await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);

7
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -301,7 +301,7 @@ namespace New_College.Services
{ {
new PlanItem() { new PlanItem() {
PlanCount=t._23Count, PlanCount=t._23Count,
RankLine=t._23ScoreLine, RankLine=t._23ScoreLine.ToString(),
Scoreline=t._23Score, Scoreline=t._23Score,
Year="2023" Year="2023"
}, },
@ -366,6 +366,7 @@ namespace New_College.Services
Expression<Func<T_TbSNeedDataInfo, bool>> expression3 = Expressionable.Create<T_TbSNeedDataInfo>() Expression<Func<T_TbSNeedDataInfo, bool>> expression3 = Expressionable.Create<T_TbSNeedDataInfo>()
.And(c => c.Location == request.Location) .And(c => c.Location == request.Location)
.And(c => c.SubjectType == batchtypeName) .And(c => c.SubjectType == batchtypeName)
.And(c => c._23ScoreLine > 0)
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c._24subject, claim01) || SqlFunc.Contains(c._24subject, claim02) || SqlFunc.Contains(c._24subject, claim03) || c._24subject == "不限") .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c._24subject, claim01) || SqlFunc.Contains(c._24subject, claim02) || SqlFunc.Contains(c._24subject, claim03) || c._24subject == "不限")
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major)) .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province))
@ -385,7 +386,7 @@ namespace New_College.Services
Name = c.Name, Name = c.Name,
}).ToList(); }).ToList();
var responselist = querylist.Select(c => new OneSubmitGoResponse() var responselist = querylist.OrderBy(c => c._23ScoreLine).Select(c => new OneSubmitGoResponse()
{ {
AreaName = c.Province, AreaName = c.Province,
@ -415,7 +416,7 @@ namespace New_College.Services
{ {
new PlanItem() { new PlanItem() {
PlanCount=c._23Count, PlanCount=c._23Count,
RankLine=c._23ScoreLine, RankLine=c._23ScoreLine.ToString(),
Scoreline=c._23Score, Scoreline=c._23Score,
Year="2023" Year="2023"
}, },

8
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -625,7 +625,7 @@ namespace New_College.Services
new PlanItem() { new PlanItem() {
PlanCount=item._23Count, PlanCount=item._23Count,
RankLine=item._23ScoreLine, RankLine=item._23ScoreLine.ToString(),
Scoreline=item._23Score, Scoreline=item._23Score,
Year="2023" Year="2023"
}, },
@ -1258,7 +1258,7 @@ namespace New_College.Services
PlanName = x.MajorName, PlanName = x.MajorName,
PlanNum = int.Parse(x._23Count), PlanNum = int.Parse(x._23Count),
Scoreline = x._23Score == "0" ? "-" : x._23Score, Scoreline = x._23Score == "0" ? "-" : x._23Score,
LowScoreRank = x._23ScoreLine == "0" ? "-" : x._23ScoreLine LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString()
}).ToList(); }).ToList();
count.FirstOrDefault().Infos.AddRange(newinfos); count.FirstOrDefault().Infos.AddRange(newinfos);
} }
@ -1285,7 +1285,7 @@ namespace New_College.Services
PlanName = x.MajorName, PlanName = x.MajorName,
PlanNum = int.Parse(x._23Count), PlanNum = int.Parse(x._23Count),
Scoreline = x._23Score == "0" ? "-" : x._23Score, Scoreline = x._23Score == "0" ? "-" : x._23Score,
LowScoreRank = x._23ScoreLine == " 0" ? "-" : x._23ScoreLine, LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString(),
YearName = yearName, YearName = yearName,
Type = query.Score.HasValue ? MajorPlanScoreTool.GetPlanScore(int.Parse(x._23Score), query.Score.Value) : 0,//还缺冲稳保 Type = query.Score.HasValue ? MajorPlanScoreTool.GetPlanScore(int.Parse(x._23Score), query.Score.Value) : 0,//还缺冲稳保
Percentage = query.Score.HasValue ? MajorPlanScoreTool.GetPlanPercentage(int.Parse(x._23Score), query.Score.Value) : 0, Percentage = query.Score.HasValue ? MajorPlanScoreTool.GetPlanPercentage(int.Parse(x._23Score), query.Score.Value) : 0,
@ -1604,7 +1604,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<List<IdNameResult>>> GetBatchByYearArea(YearAreaQuery query) public async Task<MessageModel<List<IdNameResult>>> GetBatchByYearArea(YearAreaQuery query)
{ {
query.Year = query.Year.HasValue && query.Year >= 2024 ? 2023 : query.Year;//获取批次信息新数据出来2023后需更新成2024 query.Year = query.Year.HasValue && query.Year >= 2024 ? 2024 : query.Year;//获取批次信息新数据出来2023后需更新成2024
Expression<Func<T_EnrollmentBatch, bool>> expression = Expressionable.Create<T_EnrollmentBatch>() Expression<Func<T_EnrollmentBatch, bool>> expression = Expressionable.Create<T_EnrollmentBatch>()
.And(c => c.IsDelete == false) .And(c => c.IsDelete == false)
.And(c => !c.Batch_name.Contains("提前")) .And(c => !c.Batch_name.Contains("提前"))

6
New_College.Services/V_CustomerInfoServices.cs
View File

@ -370,9 +370,15 @@ namespace New_College.Services
{ {
BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科一批").Any() ? "本科一批" : batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科二批").Any() ? "本科二批" : "专科批"; BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科一批").Any() ? "本科一批" : batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科二批").Any() ? "本科二批" : "专科批";
} }
else if (info.AreaName == "上海市")
{
BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "本科").Any() ? "本科" : "专科";
}
else else
{ {
BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段"; BatchName = batchlist.Where(c => c.Average <= info.Expectedscore && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段";
} }
if (!string.IsNullOrWhiteSpace(info.Phone) && !info.IsVIP) if (!string.IsNullOrWhiteSpace(info.Phone) && !info.IsVIP)
{ {