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

bug 修复

develop
old易 2023-10-23 13:58:27 +08:00
parent 976d0cae18
commit 99339b97ea
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
New_College.Services/D_LongIdMapServices.cs
View File

@ -757,12 +757,12 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<List<NewPlanDescList>> GetPlanBySchollId(PlanQuery query) public async Task<List<NewPlanDescList>> GetPlanBySchollId(PlanQuery query)
{ {
Expression<Func<D_PlanMajorDesc, bool>> whereexp = Expressionable.Create<D_PlanMajorDesc>() //创建表达式 Expression<Func<D_PlanMajorDesc, bool>> whereexp = Expressionable.Create<D_PlanMajorDesc>() //创建表达式
.AndIF(!string.IsNullOrEmpty(query.AreaName), c => c.Location == query.AreaName) .AndIF(!string.IsNullOrEmpty(query.AreaName), c => c.Location == query.AreaName)
.And(c => c.UId == query.UnviersityId) .And(c => c.UId == query.UnviersityId)
.AndIF(!string.IsNullOrEmpty(query.BatchName), c => c.BatchName == query.BatchName) .AndIF(!string.IsNullOrEmpty(query.BatchName), c => c.BatchName == query.BatchName)
.AndIF(query.Year > 0, c => c.Years == query.Year) .AndIF(query.Year > 0, c => c.Years == query.Year)
.ToExpression(); .ToExpression();
////var check = await t_EnrollmentBatchRepository.Query(x => x.Type == query.Type && x.Year == query.Year && x.Batch_name == query.BatchName && x.AreaName == query.AreaName); ////var check = await t_EnrollmentBatchRepository.Query(x => x.Type == query.Type && x.Year == query.Year && x.Batch_name == query.BatchName && x.AreaName == query.AreaName);
////if (check.Count <= 0) ////if (check.Count <= 0)
//var check = await d_PlanMajorDescRepository.Query(x => x.Years == query.Year && x.BatchName == query.BatchName && x.Location == query.AreaName); //var check = await d_PlanMajorDescRepository.Query(x => x.Years == query.Year && x.BatchName == query.BatchName && x.Location == query.AreaName);
@ -1658,11 +1658,11 @@ namespace New_College.Services
//this.d_PlanMajorScoreLineRepository = d_PlanMajorScoreLineRepository; //this.d_PlanMajorScoreLineRepository = d_PlanMajorScoreLineRepository;
//this.d_QualificationLineRepository = d_QualificationLineRepository; //this.d_QualificationLineRepository = d_QualificationLineRepository;
//var plandesc = await d_PlanMajorDescRepository.Query(c => c.Years == 2021 && c.Location == "山东省"); //var plandesc = await d_PlanMajorDescRepository.Query(c => c.Years == 2023 && c.Location == "山东省" );
//var plandescline = await d_PlanMajorScoreLineRepository.Query(c => c.Years == 2020 && c.Location == "山东省"); //var plandescline = await d_PlanMajorScoreLineRepository.Query(c => c.Years == 2022 && c.Location == "山东省");
//plandesc.ForEach(async a => //plandesc.ForEach(async a =>
//{ //{
// if (plandescline.Any(e => e.UId == a.UId && e.Major == a.Major && e.Location == a.Location)) // if (plandescline.Any(e => e.UId == a.UId && e.Major == a.Major && e.Location == a.Location)&&a.LowScore<=0)
// { // {
// var firstdefault = plandescline.FirstOrDefault(e => e.UId == a.UId && a.Major == e.Major && e.Location == a.Location); // var firstdefault = plandescline.FirstOrDefault(e => e.UId == a.UId && a.Major == e.Major && e.Location == a.Location);
// a.LowScore = firstdefault.LowScore; // a.LowScore = firstdefault.LowScore;
@ -1671,15 +1671,15 @@ namespace New_College.Services
// await d_PlanMajorDescRepository.Update(a); // await d_PlanMajorDescRepository.Update(a);
// } // }
// //if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("(") && !string.IsNullOrEmpty(a.SelectSubject)) //if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("(") && !string.IsNullOrEmpty(a.SelectSubject))
// //{ //{
// // a.ModifyTime = DateTime.Now; // a.ModifyTime = DateTime.Now;
// // a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("(")[0], ""); // a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("(")[0], "");
// // a.Remark = a.Remark.Remove(0, 1); // a.Remark = a.Remark.Remove(0, 1);
// // a.Major = a.Major.Split("(")[0]; // a.Major = a.Major.Split("(")[0];
// // await d_PlanMajorDescRepository.Update(a); // await d_PlanMajorDescRepository.Update(a);
// //} //}
//}); // });
//plandescline.ForEach(async a => //plandescline.ForEach(async a =>
//{ //{

16
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -502,25 +502,29 @@ namespace New_College.Services
var unum = 0; var unum = 0;
//专业数量 //专业数量
var mnum = 0; var mnum = 0;
switch (query.AreaId) switch (query.AreaName)
{ {
case 802: case "上海市":
unum = 24; unum = 24;
mnum = 4; mnum = 4;
break; break;
case 821: case "江苏省":
unum = 16; unum = 16;
mnum = 6; mnum = 6;
break; break;
case 1047: case "安徽省":
unum = 12; unum = 12;
mnum = 6; mnum = 6;
break; break;
case 1376: case "山东省":
unum = 96; unum = 96;
mnum = 1; mnum = 1;
break; break;
case 1965: case "广东省":
unum = 15;
mnum = 6;
break;
case "甘肃省":
unum = 15; unum = 15;
mnum = 6; mnum = 6;
break; break;