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

feat:上传

develop
old易 2024-05-14 21:16:04 +08:00
parent 3efd8c5fd9
commit d95fd8663f
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ namespace New_College.Controllers
//更新院校分数线 //更新院校分数线
// await d_LongIdMapServices.UpdateSchoolScoreLine23(); // await d_LongIdMapServices.UpdateSchoolScoreLine23();
await d_LongIdMapServices.PlanNeedProSync("浙江省", 2023, "综合", "普通类一段"); // await d_LongIdMapServices.PlanNeedProSync("浙江省", 2023, "综合", "普通类二段");
// await v_CustomerInfoServices.CustomeBillExport(); // await v_CustomerInfoServices.CustomeBillExport();
return true; return true;
} }

2
New_College.Model/ViewModels/Query/RecommendUniversityQuery.cs
View File

@ -21,7 +21,7 @@ namespace New_College.Model.ViewModels
/// <summary> /// <summary>
/// 学科层次 /// 学科层次
/// </summary> /// </summary>
public int SubjectLevel { get; set; } public int? SubjectLevel { get; set; }
/// <summary> /// <summary>
/// 省市区名称 /// 省市区名称
/// </summary> /// </summary>

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

@ -354,7 +354,7 @@ namespace New_College.Repository
.Where((plans, universitys) => plans.Location == query.Location) .Where((plans, universitys) => plans.Location == query.Location)
.Where((plans, universitys) => plans.SubjectType == subjecttype) .Where((plans, universitys) => plans.SubjectType == subjecttype)
.Where((plans, universitys) => plans.Years == query.Year) .Where((plans, universitys) => plans.Years == query.Year)
.WhereIF(query.SubjectLevel > 0, (plans, universitys) => universitys.Subject_Level == query.SubjectLevel) .WhereIF(query.SubjectLevel.HasValue, (plans, universitys) => universitys.Subject_Level == query.SubjectLevel)
.WhereIF(query.Type >= 0, (plans, universitys) => universitys.Type == query.Type) .WhereIF(query.Type >= 0, (plans, universitys) => universitys.Type == query.Type)
.WhereIF(query.Nhef >= 0, (plans, universitys) => universitys.Nhef == query.Nhef) .WhereIF(query.Nhef >= 0, (plans, universitys) => universitys.Nhef == query.Nhef)
.WhereIF(query.Sff >= 0, (plans, universitys) => universitys.Sff == query.Sff) .WhereIF(query.Sff >= 0, (plans, universitys) => universitys.Sff == query.Sff)

5
New_College.Services/D_LongIdMapServices.cs
View File

@ -2278,11 +2278,14 @@ namespace New_College.Services
var universitylist = await d_UniversityRepository.Query(); var universitylist = await d_UniversityRepository.Query();
var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == location); var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == location);
var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.BatchName == batchname && c.IsDelete == false); var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.BatchName == batchname && c.IsDelete == false);
var countid = (await this.t_TbSNeedDataInfoRepository.Query()).OrderByDescending(c => c.ID).FirstOrDefault().ID;
plist.ForEach(a => plist.ForEach(a =>
{ {
countid++;
var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault(); var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault();
needlist.Add(new T_TbSNeedDataInfo() needlist.Add(new T_TbSNeedDataInfo()
{ {
ID = countid,
AcademicYear = a.AcademicYear, AcademicYear = a.AcademicYear,
// 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,
@ -2315,7 +2318,7 @@ namespace New_College.Services
}); });
var tt = needlist; var tt = needlist;
await t_TbSNeedDataInfoRepository.BatchAdd(tt); await t_TbSNeedDataInfoRepository.BatchAdd(tt);
return true; return true;
} }
/// <summary> /// <summary>