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

--FIX BUG--

develop
易大师 2021-07-04 19:00:55 +08:00
parent a097d19090
commit 0382afd44f
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
New_College.Services/T_EnrollmentPlaneServices.cs
View File

@ -56,11 +56,9 @@ namespace New_College.Services
{
var universitylist = await this.d_University.Query(x => x.IsDelete == false);
var majorlist = await this.d_Major.Query(x => x.IsDelete == false);
var batchlist = await this.t_EnrollmentBatch.Query(x => x.IsDelete == false);
var batchlist = await this.t_EnrollmentBatch.Query(x => x.IsDelete == false && x.AreaId == 1376 && x.Year == 2021);
var planinfo =
await this.t_EnrollmentPlanedesc.Query(e => e.PlanId == 7);
await this.t_EnrollmentPlanedesc.Query(e => e.PlanId == 10);
List<T_EnrollmentPlanedesc> list = new List<T_EnrollmentPlanedesc>() { };
List<string> adduniversity = new List<string>() { };
@ -90,7 +88,7 @@ namespace New_College.Services
remake = major.Substring(indexs);
major = major.Substring(0, indexs);
}
var majorid = majorlist.Where(x => x.Name == major).Select(x => x.Id).FirstOrDefault();
var majorid = majorlist.Where(x => x.Name == major.Trim()).Select(x => x.Id).FirstOrDefault();
var planinfomodel = planinfo.Where(e => e.UniversityId == universityid && e.MajorId == majorid && e.BatchtypeId == batchid);
@ -112,34 +110,34 @@ namespace New_College.Services
return true;
}
#region 2019上海招生分数更新
#region 2021招生分数更新
///// <summary>
///// 2019上海招生分数更新
///// 2021上海招生分数更新
///// </summary>
///// <returns></returns>
//public async Task<bool> Import()
//{
// var dataSet = ExcelUtil.ReadExcelToDataSet("D:\\Ashuju\\数据\\好帮手\\招生计划\\导入步骤\\更新3\\2019上海招生分数更新.xlsx");
// var dataSet = ExcelUtil.ReadExcelToDataSet("D:\\一草一木\\2021年山东本科招生计划.xls");
// if (dataSet.Tables.Count > 0)
// {
// var universitylist = await d_UniversityRepository.Query(x => x.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(x => x.IsDelete == false);
// var batchlist = await t_EnrollmentBatchRepository.Query(x => x.IsDelete == false);
// var universitylist = await this.d_University.Query(x => x.IsDelete == false);
// var majorlist = await this.d_Major.Query(x => x.IsDelete == false);
// var batchlist = await this.t_EnrollmentBatch.Query(x => x.IsDelete == false && x.AreaId == 1376 && x.Year == 2021);
// List<T_EnrollmentPlanedesc> list = new List<T_EnrollmentPlanedesc>() { };
// List<string> adduniversity = new List<string>() { };
// foreach (DataRow dr in dataSet.Tables[0].Rows)
// {
// string schoolname = dr["学校名称"].ToString();
// string schoolname = dr["院校名称"].ToString();
// string area = dr["省份"].ToString();
// string major = dr["专业"].ToString();
// string batch = dr["批次"].ToString();
// string avgscore = dr["平均分"].ToString();
// string scoreline = dr["最低分"].ToString();
// string mustsubject = dr["必修课数"].ToString();
// string subjectclaim = dr["选科描述"].ToString();
// string plannum = dr["实际录取人数"].ToString();
// string type = dr["文理"].ToString();
// //string avgscore = dr["平均分"].ToString();
// //string scoreline = dr["最低分"].ToString();
// string subjectclaim = dr["科类"].ToString();
// string plannum = dr["计划人数"].ToString();
// var universityid = universitylist.Where(x => x.Name == schoolname).Select(x => x.Id).FirstOrDefault();
// if (universityid <= 0)
@ -155,17 +153,17 @@ namespace New_College.Services
// {
// int indexs = major.IndexOf("(");
// remake = major.Substring(indexs);
// major = major.Substring(0, indexs);
// major = major.Substring(0, indexs).Trim();
// }
// var majorid = majorlist.Where(x => x.Name == major).Select(x => x.Id).FirstOrDefault();
// var majorid = majorlist.Where(x => major.Contains(x.Name)).Select(x => x.Id).FirstOrDefault();
// list.Add(new T_EnrollmentPlanedesc()
// {
// UniversityId = universityid,
// BatchtypeId = batchid,
// Plancount = Convert.ToInt32(plannum),
// PlanId = 1,
// Scoreline = float.Parse(scoreline),
// majoraverage = float.Parse(avgscore),
// PlanId = 10,
// //Scoreline = float.Parse(scoreline),
// //majoraverage = float.Parse(avgscore),
// MajorName = major,
// Remark = remake,
// MajorId = majorid,
@ -173,7 +171,7 @@ namespace New_College.Services
// });
// }
// var cc = adduniversity;
// var count = await t_EnrollmentPlanedescServices.Add(list);
// var count = await t_EnrollmentPlanedesc.Add(list);
// }
// return true;
//}