feat:上传
parent
3efd8c5fd9
commit
d95fd8663f
|
|
@ -71,7 +71,7 @@ namespace New_College.Controllers
|
|||
//更新院校分数线
|
||||
// await d_LongIdMapServices.UpdateSchoolScoreLine23();
|
||||
|
||||
await d_LongIdMapServices.PlanNeedProSync("浙江省", 2023, "综合", "普通类一段");
|
||||
// await d_LongIdMapServices.PlanNeedProSync("浙江省", 2023, "综合", "普通类二段");
|
||||
// await v_CustomerInfoServices.CustomeBillExport();
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ namespace New_College.Model.ViewModels
|
|||
/// <summary>
|
||||
/// 学科层次
|
||||
/// </summary>
|
||||
public int SubjectLevel { get; set; }
|
||||
public int? SubjectLevel { get; set; }
|
||||
/// <summary>
|
||||
/// 省市区名称
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ namespace New_College.Repository
|
|||
.Where((plans, universitys) => plans.Location == query.Location)
|
||||
.Where((plans, universitys) => plans.SubjectType == subjecttype)
|
||||
.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.Nhef >= 0, (plans, universitys) => universitys.Nhef == query.Nhef)
|
||||
.WhereIF(query.Sff >= 0, (plans, universitys) => universitys.Sff == query.Sff)
|
||||
|
|
|
|||
|
|
@ -2278,11 +2278,14 @@ namespace New_College.Services
|
|||
var universitylist = await d_UniversityRepository.Query();
|
||||
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 countid = (await this.t_TbSNeedDataInfoRepository.Query()).OrderByDescending(c => c.ID).FirstOrDefault().ID;
|
||||
plist.ForEach(a =>
|
||||
{
|
||||
countid++;
|
||||
var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault();
|
||||
needlist.Add(new T_TbSNeedDataInfo()
|
||||
{
|
||||
ID = countid,
|
||||
AcademicYear = a.AcademicYear,
|
||||
// City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name
|
||||
Province = u.Area_Name,
|
||||
|
|
@ -2315,7 +2318,7 @@ namespace New_College.Services
|
|||
|
||||
});
|
||||
var tt = needlist;
|
||||
await t_TbSNeedDataInfoRepository.BatchAdd(tt);
|
||||
await t_TbSNeedDataInfoRepository.BatchAdd(tt);
|
||||
return true;
|
||||
}
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Reference in New Issue