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

feat:bug fixed

develop
old易 2023-10-08 15:46:22 +08:00
parent fc719393a3
commit 45dc30b0dd
9 changed files with 191 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,6 +565,16 @@
生源地 生源地
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Models.D_PlanMajorDesc.MajorGroup">
<summary>
专业组
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDesc.Remark">
<summary>
专业备注
</summary>
</member>
<member name="T:New_College.Model.Models.D_PlanMajorScoreLine"> <member name="T:New_College.Model.Models.D_PlanMajorScoreLine">
<summary> <summary>
各省份每年招生计划专业分数线 各省份每年招生计划专业分数线
@ -636,6 +646,11 @@
生源地 生源地
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Models.D_PlanMajorScoreLine.MajorGroup">
<summary>
专业组
</summary>
</member>
<member name="T:New_College.Model.Models.D_QualificationLine"> <member name="T:New_College.Model.Models.D_QualificationLine">
<summary> <summary>
各个省份投档资格线 各个省份投档资格线
@ -711,6 +726,11 @@
生源地 生源地
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Models.D_QualificationLine.MajorGroup">
<summary>
专业组
</summary>
</member>
<member name="T:New_College.Model.Models.D_ScoreLine"> <member name="T:New_College.Model.Models.D_ScoreLine">
<summary> <summary>
一分一段|省份 年份 科类 分数 本段人数 累计人数 一分一段|省份 年份 科类 分数 本段人数 累计人数
@ -3590,6 +3610,11 @@
高考年份 高考年份
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.CWBUniversityDetailQuery.Location">
<summary>
考生所在地
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CWBUniversityDetailQuery.MajorIds"> <member name="P:New_College.Model.ViewModels.CWBUniversityDetailQuery.MajorIds">
<summary> <summary>
专业Ids 专业Ids
@ -3690,6 +3715,21 @@
选择科目 选择科目
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.RecommendUniversityQuery.Location">
<summary>
省份名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.RecommendUniversityQuery.AreaId">
<summary>
省份Id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.RecommendUniversityQuery.Year">
<summary>
年份
</summary>
</member>
<member name="T:New_College.Model.ViewModels.UniversityProbabilityQuery"> <member name="T:New_College.Model.ViewModels.UniversityProbabilityQuery">
<summary> <summary>
录取概率传入 录取概率传入

8
New_College.Model/Models/D_PlanMajorDesc.cs
View File

@ -82,7 +82,15 @@ namespace New_College.Model.Models
/// </summary> /// </summary>
public string Location { get; set; } public string Location { get; set; }
/// <summary>
/// 专业组
/// </summary>
public string MajorGroup { get; set; }
/// <summary>
/// 专业备注
/// </summary>
public string Remark { get; set; }
} }

9
New_College.Model/Models/D_PlanMajorScoreLine.cs
View File

@ -59,6 +59,10 @@ namespace New_College.Model.Models
[SugarColumn(IsNullable = true, Length = 500)] [SugarColumn(IsNullable = true, Length = 500)]
public string Major { get; set; } public string Major { get; set; }
[SugarColumn(IsNullable = true, Length = 1000)]
public string Remark { get; set; }
/// <summary> /// <summary>
/// 平均分 /// 平均分
/// </summary> /// </summary>
@ -84,6 +88,11 @@ namespace New_College.Model.Models
/// </summary> /// </summary>
public string Location { get; set; } public string Location { get; set; }
/// <summary>
/// 专业组
/// </summary>
public string MajorGroup { get; set; }
} }
} }

5
New_College.Model/Models/D_QualificationLine.cs
View File

@ -88,6 +88,11 @@ namespace New_College.Model.Models
public string Location { get; set; } public string Location { get; set; }
/// <summary>
/// 专业组
/// </summary>
public string MajorGroup { get; set; }
} }

4
New_College.Model/ViewModels/Query/PlanDetailQuery.cs
View File

@ -40,6 +40,10 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public int Year { get; set; } public int Year { get; set; }
/// <summary>
/// 考生所在地
/// </summary>
public string Location { get; set; }
/// <summary> /// <summary>
/// 专业Ids /// 专业Ids
/// </summary> /// </summary>

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

@ -55,6 +55,25 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public string SubjectClaim { get; set; } public string SubjectClaim { get; set; }
/// <summary>
/// 省份名称
/// </summary>
public string Location { get; set; }
/// <summary>
/// 省份Id
/// </summary>
public int AreaId { get; set; }
/// <summary>
/// 年份
/// </summary>
public int Year { get; set; }
} }
/// <summary> /// <summary>

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

@ -27,7 +27,15 @@ namespace New_College.Repository
private readonly ID_PlanMajorDescRepository planMajorDesc; private readonly ID_PlanMajorDescRepository planMajorDesc;
private readonly ID_PlanMajorScoreLineRepository planMajorScoreLine; private readonly ID_PlanMajorScoreLineRepository planMajorScoreLine;
private readonly ID_UniversityRepository d_University; private readonly ID_UniversityRepository d_University;
public T_EnrollmentPlanedescRepository(IUnitOfWork unitOfWork, IV_CustomerInfoRepository _CustomerInfoRepository, IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository, ID_MajorRepository d_MajorRepository, ID_PlanMajorDescRepository planMajorDesc, ID_PlanMajorScoreLineRepository planMajorScoreLine, ID_UniversityRepository d_University) : base(unitOfWork) private readonly ISysRegionRepository _sysRegionRepository;
public T_EnrollmentPlanedescRepository(IUnitOfWork unitOfWork,
IV_CustomerInfoRepository _CustomerInfoRepository,
IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository,
ID_MajorRepository d_MajorRepository,
ID_PlanMajorDescRepository planMajorDesc,
ID_PlanMajorScoreLineRepository planMajorScoreLine,
ID_UniversityRepository d_University,
ISysRegionRepository sysRegionRepository) : base(unitOfWork)
{ {
this.v_CustomerInfo = _CustomerInfoRepository; this.v_CustomerInfo = _CustomerInfoRepository;
this.t_EnrollmentPlane = t_EnrollmentPlaneRepository; this.t_EnrollmentPlane = t_EnrollmentPlaneRepository;
@ -35,6 +43,7 @@ namespace New_College.Repository
this.planMajorDesc = planMajorDesc; this.planMajorDesc = planMajorDesc;
this.planMajorScoreLine = planMajorScoreLine; this.planMajorScoreLine = planMajorScoreLine;
this.d_University = d_University; this.d_University = d_University;
this._sysRegionRepository = sysRegionRepository;
} }
/// <summary> /// <summary>
@ -45,6 +54,7 @@ namespace New_College.Repository
public async Task<MessageModel<PageModel<UniversityEnrollmentPlanResult>>> GetCWBUniversityDetail(CWBUniversityDetailQuery query) public async Task<MessageModel<PageModel<UniversityEnrollmentPlanResult>>> GetCWBUniversityDetail(CWBUniversityDetailQuery query)
{ {
var regionlist = this.Db.Queryable<SysRegion>().Where(c => c.Level == 1).WhereIF(query.provinceIds != null && query.provinceIds.Any(), c => query.provinceIds.Contains(c.KeyId)).Select(c => c.RegionName).ToList();
RefAsync<int> totalNumber = 0; RefAsync<int> totalNumber = 0;
// int planId = (await t_EnrollmentPlane.Query(e => e.Years == query.Year && e.Area_Id == query.AreaId)).FirstOrDefault().Id; // int planId = (await t_EnrollmentPlane.Query(e => e.Years == query.Year && e.Area_Id == query.AreaId)).FirstOrDefault().Id;
@ -63,7 +73,7 @@ namespace New_College.Repository
sbuTree = subjects[2]; sbuTree = subjects[2];
} }
var majornames = new List<string>(); var majornames = new List<string>();
var majoraslist= new List<D_Major>(); var majoraslist = new List<D_Major>();
if (query.MajorIds != null && query.MajorIds.Count > 0) if (query.MajorIds != null && query.MajorIds.Count > 0)
{ {
//所选专业增加majorids筛选 //所选专业增加majorids筛选
@ -76,7 +86,10 @@ namespace New_College.Repository
var testlist = new List<int>() { 1, 2, 3 }; var testlist = new List<int>() { 1, 2, 3 };
var recommendInfo = await this.Db.Queryable<D_PlanMajorDesc, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id, JoinType.Left }) var recommendInfo = await this.Db.Queryable<D_PlanMajorDesc, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id, JoinType.Left })
//.Where((plans, universitys) => plans.PlanId == planId && plans.BatchtypeId == query.BatchId) //.Where((plans, universitys) => plans.PlanId == planId && plans.BatchtypeId == query.BatchId)
.WhereIF(query.areaIds != null && query.areaIds.Count() > 0, (plans, universitys) => query.areaIds.Contains(universitys.Area_Id)) // .WhereIF(query.areaIds != null && query.areaIds.Count() > 0, (plans, universitys) => query.areaIds.Contains(universitys.Area_Id))
.WhereIF(regionlist.Any(), (plans, universitys) => regionlist.Contains(universitys.Area_Name))
.WhereIF(query.Year > 0, (plans, universitys) => plans.Years == query.Year)
.WhereIF(!string.IsNullOrEmpty(query.Location), (plans, universitys) => plans.Location == query.Location)
.WhereIF(string.IsNullOrWhiteSpace(query.Type), (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15)) .WhereIF(string.IsNullOrWhiteSpace(query.Type), (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15))
.WhereIF(query.Type == "冲", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15 && plans.LowScore > query.Score + 5)) .WhereIF(query.Type == "冲", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15 && plans.LowScore > query.Score + 5))
.WhereIF(query.Type == "稳", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 5 && plans.LowScore > query.Score - 15)) .WhereIF(query.Type == "稳", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 5 && plans.LowScore > query.Score - 15))
@ -101,18 +114,20 @@ namespace New_College.Repository
Sff = universitys.Sff, Sff = universitys.Sff,
Syl = universitys.Syl, Syl = universitys.Syl,
planCount = SqlFunc.AggregateSum(plans.PlanCount),// plandesc.Where(x => x.UniversityId == item.Id).Select(x => x.Id).ToList() planCount = SqlFunc.AggregateSum(plans.PlanCount),// plandesc.Where(x => x.UniversityId == item.Id).Select(x => x.Id).ToList()
MjaorPlan = SqlFunc.AggregateCount(plans.UId), MjaorPlan = SqlFunc.AggregateCount(plans.UId),
Scoreline = SqlFunc.AggregateMin(plans.LowScore), Scoreline = SqlFunc.AggregateMin(plans.LowScore),
// PlanIds= String.Join(" ",plans.Id) // PlanIds= String.Join(" ",plans.Id)
}) })
.ToPageListAsync(query.PageIndex, query.PageSize, totalNumber); .ToPageListAsync(query.PageIndex, query.PageSize, totalNumber);
var plansinfo = await this.Db.Queryable<D_PlanMajorDesc, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id, JoinType.Left }) var plansinfo = await this.Db.Queryable<D_PlanMajorDesc, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id, JoinType.Left })
//.Where((plans, universitys) => plans.PlanId == planId && plans.BatchtypeId == query.BatchId) //.Where((plans, universitys) => plans.PlanId == planId && plans.BatchtypeId == query.BatchId)
.WhereIF(query.areaIds != null && query.areaIds.Count() > 0, (plans, universitys) => query.areaIds.Contains(universitys.Area_Id)) .WhereIF(query.areaIds != null && query.areaIds.Count() > 0, (plans, universitys) => query.areaIds.Contains(universitys.Area_Id))
.WhereIF(string.IsNullOrWhiteSpace(query.Type), (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15)) .WhereIF(string.IsNullOrWhiteSpace(query.Type), (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15))
.WhereIF(query.Year > 0, (plans, universitys) => plans.Years == query.Year)
.WhereIF(!string.IsNullOrEmpty(query.Location), (plans, universitys) => plans.Location == query.Location)
.WhereIF(query.Type == "冲", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15 && plans.LowScore > query.Score + 5)) .WhereIF(query.Type == "冲", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 15 && plans.LowScore > query.Score + 5))
.WhereIF(query.Type == "稳", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 5 && plans.LowScore > query.Score - 15)) .WhereIF(query.Type == "稳", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore <= query.Score + 5 && plans.LowScore > query.Score - 15))
.WhereIF(query.Type == "保", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore < query.Score - 15)) .WhereIF(query.Type == "保", (plans, universitys) => plans.LowScore > 0 && (plans.LowScore < query.Score - 15))
@ -122,7 +137,7 @@ namespace New_College.Repository
recommendInfo.ForEach(a => recommendInfo.ForEach(a =>
{ {
a.PlanIds = plansinfo.Where(c=>c.UId==a.UniversityId).Select(c=>c.Id).ToList(); a.PlanIds = plansinfo.Where(c => c.UId == a.UniversityId).Select(c => c.Id).ToList();
a.Type = (a.Scoreline <= chongfirst && a.Scoreline > chongend) ? "冲" : (a.Scoreline <= chongend && a.Scoreline > wenend) ? "稳" : "保"; a.Type = (a.Scoreline <= chongfirst && a.Scoreline > chongend) ? "冲" : (a.Scoreline <= chongend && a.Scoreline > wenend) ? "稳" : "保";
}); });
@ -151,23 +166,23 @@ namespace New_College.Repository
RefAsync<int> totalNumber = 0; RefAsync<int> totalNumber = 0;
var maxscore = query.Score + 10; var maxscore = query.Score + 10;
var minscore = query.Score - 10; var minscore = query.Score - 10;
var custome = (await this.v_CustomerInfo.QueryById(query.CustomerId)); //var custome = (await this.v_CustomerInfo.QueryById(query.CustomerId));
// int planId = (await t_EnrollmentPlane.Query(e => e.Years == custome.Year && e.Area_Id == custome.AreaId)).FirstOrDefault().Id; // int planId = (await t_EnrollmentPlane.Query(e => e.Years == custome.Year && e.Area_Id == custome.AreaId)).FirstOrDefault().Id;
var subjects = new string[] { }; //var subjects = new string[] { };
string sbuOne = string.Empty; //string sbuOne = string.Empty;
string sbuTwo = string.Empty; //string sbuTwo = string.Empty;
string sbuTree = string.Empty; //string sbuTree = string.Empty;
if (!string.IsNullOrWhiteSpace(query.SubjectClaim)) //if (!string.IsNullOrWhiteSpace(query.SubjectClaim))
{ //{
subjects = query.SubjectClaim.Split(","); // subjects = query.SubjectClaim.Split(",");
sbuOne = subjects[0]; // sbuOne = subjects[0];
sbuTwo = subjects[1]; // sbuTwo = subjects[1];
sbuTree = subjects[2]; // sbuTree = subjects[2];
} //}
var recommendInfo = await this.Db.Queryable<D_PlanMajorDesc, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id }) var recommendInfo = await this.Db.Queryable<D_QualificationLine, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id })
.Where((plans, universitys) => plans.Location == custome.AreaName.Replace("省","")) .Where((plans, universitys) => plans.Location == query.Location)
.Where((plans, universitys) => plans.Years == custome.Year) .Where((plans, universitys) => plans.Years == query.Year - 1)
.WhereIF(query.SubjectLevel > 0, (plans, universitys) => universitys.Subject_Level == query.SubjectLevel) .WhereIF(query.SubjectLevel > 0, (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)
@ -177,9 +192,9 @@ namespace New_College.Repository
.WhereIF(!string.IsNullOrWhiteSpace(query.AreaName) && query.AreaName != "选择省份", (plans, universitys) => universitys.Area_Name.Contains(query.AreaName)) .WhereIF(!string.IsNullOrWhiteSpace(query.AreaName) && query.AreaName != "选择省份", (plans, universitys) => universitys.Area_Name.Contains(query.AreaName))
.WhereIF(maxscore > 10, (plans, universitys) => plans.LowScore <= maxscore) .WhereIF(maxscore > 10, (plans, universitys) => plans.LowScore <= maxscore)
.WhereIF(minscore > 0, (plans, universitys) => plans.LowScore > minscore) .WhereIF(minscore > 0, (plans, universitys) => plans.LowScore > minscore)
.WhereIF(query.Ranking > 0, (plans, universitys) => plans.LowScoreRank >= query.Ranking + 1) .WhereIF(query.Ranking > 0, (plans, universitys) => plans.LowScoreRank >= query.Ranking - 6)
.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.SelectSubject.Contains(sbuOne) || plans.SelectSubject.Contains(sbuTwo) || plans.SelectSubject.Contains(sbuTree))) //.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.SelectSubject.Contains(sbuOne) || plans.SelectSubject.Contains(sbuTwo) || plans.SelectSubject.Contains(sbuTree)))
.OrderBy((plans, universitys) => plans.LowScore, OrderByType.Desc) .OrderBy((plans, universitys) => plans.LowScoreRank, OrderByType.Asc)
.Select((plans, universitys) => new UniversityResult() .Select((plans, universitys) => new UniversityResult()
{ {
Id = plans.Id, Id = plans.Id,
@ -195,41 +210,9 @@ namespace New_College.Repository
UniversityType = universitys.Type, UniversityType = universitys.Type,
Scorepostion = plans.LowScoreRank, Scorepostion = plans.LowScoreRank,
ScoreLine = plans.LowScore, ScoreLine = plans.LowScore,
Years=plans.Years Years = plans.Years
}) })
.ToPageListAsync(query.PageIndex, query.PageSize, totalNumber); .ToPageListAsync(query.PageIndex, query.PageSize, totalNumber);
// var recommendInfo = await this.Db.Queryable<T_EnrollmentPlanedesc, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UniversityId == universitys.Id })
// .Where((plans, universitys) => plans.PlanId == planId)
//.WhereIF(query.SubjectLevel > 0, (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)
//.WhereIF(query.Syl >= 0, (plans, universitys) => universitys.Syl == query.Syl)
//.WhereIF(query.Nature > 0, (plans, universitys) => universitys.Nature == query.Nature)
//.WhereIF(!string.IsNullOrWhiteSpace(query.AreaName) && query.AreaName != "选择省份", (plans, universitys) => universitys.Area_Name.Contains(query.AreaName))
//.WhereIF(maxscore > 10, (plans, universitys) => plans.Scoreline <= maxscore)
//.WhereIF(minscore > 0, (plans, universitys) => plans.Scoreline > minscore)
//.WhereIF(query.Ranking > 0, (plans, universitys) => plans.scorepostion >= query.Ranking + 1)
//.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.Subjectclaim.Contains(sbuOne) || plans.Subjectclaim.Contains(sbuTwo) || plans.Subjectclaim.Contains(sbuTree)))
//.OrderBy((plans, universitys) => plans.Scoreline, OrderByType.Desc)
//.Select((plans, universitys) => new UniversityResult()
//{
// Id = plans.Id,
// Name = universitys.Name,
// Nature = universitys.Nature,
// AscriptionName = universitys.AscriptionName,
// SubjectLevel = universitys.Subject_Level,
// AreaName = universitys.Area_Name,
// Logo = universitys.Logo,
// Syl = universitys.Syl == 1 ? true : false,
// Nhef = universitys.Nhef == 1 ? true : false,
// Sff = universitys.Sff == 1 ? true : false,
// UniversityType = universitys.Type,
// Scorepostion = plans.scorepostion.Value,
// ScoreLine = plans.Scoreline
//})
//.ToPageListAsync(query.PageIndex, query.PageSize, totalNumber);
return new PageModel<UniversityResult>() return new PageModel<UniversityResult>()
{ {
data = recommendInfo, data = recommendInfo,

67
New_College.Services/D_LongIdMapServices.cs
View File

@ -1596,38 +1596,27 @@ namespace New_College.Services
public async Task<bool> Import() public async Task<bool> Import()
{ {
var plandesc = await d_PlanMajorDescRepository.Query(c => c.Years == 2022 && c.Location == "山东");
var plandescline = await d_PlanMajorScoreLineRepository.Query(c => c.Years == 2022 && c.Location == "山东");
plandesc.ForEach(async a =>
{
if (plandescline.Any(e => e.UId == a.UId && e.Major == a.Major && e.Location == a.Location && e.FirstType == a.FirstType))
{
var firstdefault = plandescline.FirstOrDefault(e => e.UId == a.UId && a.Major.Contains(e.Major) && e.Location == a.Location && e.FirstType == a.FirstType);
a.LowScore = firstdefault.LowScore;
a.LowScoreRank = firstdefault.LowScoreRank;
a.ModifyTime=DateTime.Now;
await d_PlanMajorDescRepository.Update(a);
}
});
//var universitylist = await d_UniversityRepository.Query(); //var universitylist = await d_UniversityRepository.Query();
//var plist = await this._PlanMajorDescRepository.Query(c => c.Location == "山东" && c.Years == 2023);
//universitylist.ForEach(async u => //universitylist.ForEach(async u =>
//{ //{
// var plist = await this._PlanMajorDescRepository.Query(c => c.UniversityName == u.Name && c.UId <= 0);
// plist.ForEach(async cc => // plist.ForEach(async cc =>
// { // {
// cc.UId = u.Id; // if (cc.UniversityName == u.Name)
// cc.ModifyTime = DateTime.Now; // {
// await this._PlanMajorDescRepository.Update(cc); // cc.UId = u.Id;
// cc.ModifyTime = DateTime.Now;
// await this._PlanMajorDescRepository.Update(cc);
// }
// }); // });
//});
// var p2list = await this.d_PlanMajorScoreLineRepository.Query(c => c.UniversityName == u.Name && c.UId <= 0); // var p2list = await this.d_PlanMajorScoreLineRepository.Query(c => c.UniversityName == u.Name && c.UId <= 0);
@ -1660,6 +1649,42 @@ 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 plandescline = await d_PlanMajorScoreLineRepository.Query(c => c.Years == 2020 && c.Location == "山东");
plandesc.ForEach(async a =>
{
if (plandescline.Any(e => e.UId == a.UId && e.Major == a.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.LowScoreRank = firstdefault.LowScoreRank;
a.ModifyTime = DateTime.Now;
await d_PlanMajorDescRepository.Update(a);
}
//if (!string.IsNullOrEmpty(a.Major)&&a.Major.Contains("(") &&!string.IsNullOrEmpty(a.SelectSubject))
//{
// a.ModifyTime = DateTime.Now;
// a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("(")[0], "");
// a.Remark = a.Remark.Remove(0, 1);
// a.Major = a.Major.Split("(")[0];
// await d_PlanMajorDescRepository.Update(a);
//}
});
//plandescline.ForEach(async a =>
//{
// if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("（") && !string.IsNullOrEmpty(a.SelectSubject))
// {
// a.ModifyTime = DateTime.Now;
// a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("（")[0], "");
// a.Remark = a.Remark.Remove(0, 1);
// a.Major = a.Major.Split("（")[0];
// await d_PlanMajorDescRepository.Update(a);
// }
//});
return true; return true;
} }

32
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -930,8 +930,8 @@ namespace New_College.Services
var majorclassinfo = await d_MajorClassRepository.Query(x => query.MajorIds.Contains(x.TradeId) && x.IsDelete == false); var majorclassinfo = await d_MajorClassRepository.Query(x => query.MajorIds.Contains(x.TradeId) && x.IsDelete == false);
var CategoryClassids = majorclassinfo.Select(x => x.Id).ToList(); var CategoryClassids = majorclassinfo.Select(x => x.Id).ToList();
var major = await d_MajorRepository.Query(x => x.IsDelete == false && CategoryClassids.Contains(x.CategoryClass_Id)); var major = await d_MajorRepository.Query(x => x.IsDelete == false && CategoryClassids.Contains(x.CategoryClass_Id));
if (major.Count() <= 0) //if (major.Count() <= 0)
return new MessageModel<List<UniversityEnrollmentPlanLazyResult>>() { success = false, msg = "请选择专业大类，或所选专业大类数据完善中..." }; // return new MessageModel<List<UniversityEnrollmentPlanLazyResult>>() { success = false, msg = "请选择专业大类，或所选专业大类数据完善中..." };
var majornames = major.Select(x => x.MajorName).ToList(); var majornames = major.Select(x => x.MajorName).ToList();
//通过办学性质和高校级别筛选出学校的ids //通过办学性质和高校级别筛选出学校的ids
//string sql = ""; //string sql = "";
@ -976,14 +976,14 @@ namespace New_College.Services
// return new MessageModel<List<UniversityEnrollmentPlanLazyResult>>() { success = false, msg = "符合条件招生条件为空..." }; // return new MessageModel<List<UniversityEnrollmentPlanLazyResult>>() { success = false, msg = "符合条件招生条件为空..." };
Expression<Func<D_PlanMajorDesc, bool>> exp = Expressionable.Create<D_PlanMajorDesc>() //创建表达式 Expression<Func<D_PlanMajorDesc, bool>> exp = Expressionable.Create<D_PlanMajorDesc>() //创建表达式
.And(c => c.IsDelete == false) .And(c => c.IsDelete == false)
.AndIF(query.Year > 0, w => w.Years == query.Year) .AndIF(query.Year > 0, w => w.Years == query.Year)
.AndIF(!string.IsNullOrEmpty(query.AreaName), w => w.Location == query.AreaName.Replace("省", "")) .AndIF(!string.IsNullOrEmpty(query.AreaName), w => w.Location == query.AreaName)
.And(x => x.LowScore <= (query.Score + 10) && x.LowScore > 0) .And(x => x.LowScore <= (query.Score + 10) && x.LowScore > 0)
.And(x => majornames.Contains(x.Major)) .AndIF(majornames.Any()&& majornames.Count()>0, x => majornames.Contains(x.Major))
.And(x => universityids.Contains(x.UId)) .And(x => universityids.Contains(x.UId))
.ToExpression();//注意 这一句 不能少 .ToExpression();//注意 这一句 不能少
var plandesc = await _PlanMajorDescRepository.Query(exp); var plandesc = await _PlanMajorDescRepository.Query(exp);
plandesc = plandesc.OrderByDescending(c => c.LowScore).ToList(); plandesc = plandesc.OrderByDescending(c => c.LowScore).ToList();
@ -1082,24 +1082,28 @@ namespace New_College.Services
public async Task<MessageModel<PageModel<PlanDescList>>> GetPlanByUniversity(PlanDetailQuery query) public async Task<MessageModel<PageModel<PlanDescList>>> GetPlanByUniversity(PlanDetailQuery query)
{ {
if (query.PlanIds != null && query.PlanIds.Count <= 0) if (query.PlanIds != null && query.PlanIds.Count <= 0)
return new MessageModel<PageModel<PlanDescList>>() { success = false, msg = "传入不能为空" }; return new MessageModel<PageModel<PlanDescList>>() { success = false, msg = "传入不能为空" };
var info = await _PlanMajorDescRepository.QueryPage(x => x.IsDelete == false && query.PlanIds.Contains(x.Id), query.PageIndex, query.PageSize, "LowScore desc"); var info = await _PlanMajorDescRepository.QueryPage(x => x.IsDelete == false && query.PlanIds.Contains(x.Id), query.PageIndex, query.PageSize, "LowScore desc");
int tpyear = info.data.FirstOrDefault().Years;
string tpname = info.data.FirstOrDefault().UniversityName;
string location = info.data.FirstOrDefault().Location;
// var planmajorlist = await _PlanMajorDescRepository.Query(c => c.UniversityName == tpname && c.Years == tpyear - 1 && c.Location == location);
List<PlanDescList> list = new List<PlanDescList>() { }; List<PlanDescList> list = new List<PlanDescList>() { };
foreach (var item in info.data) foreach (var item in info.data)
{ {
var newname = item.Major; var newname = item.Major;
var newmoney = string.IsNullOrWhiteSpace(item.Free) || item.Free == "0" || item.Free == "待定" ? "--" : item.Free; var newmoney = string.IsNullOrWhiteSpace(item.Free) || item.Free == "0" || item.Free == "待定" ? "--" : item.Free;
var newyear = string.IsNullOrWhiteSpace(item.AcademicYear) ? "--" : item.AcademicYear; // var newyear = string.IsNullOrWhiteSpace(item.AcademicYear) ? "--" : item.AcademicYear;
// var newyear = planmajorlist.FirstOrDefault().Years.ToString();
// float scoreLine = planmajorlist.Where(c => c.UniversityName == item.UniversityName && c.Major == item.Major).Any() ? planmajorlist.Where(c => c.UniversityName == item.UniversityName && c.Major == item.Major).FirstOrDefault().LowScore : 0;
var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore); var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore);
if (count > 0) if (count > 0)
continue; continue;
list.Add(new PlanDescList() list.Add(new PlanDescList()
{ {
Name = newname, Name = newname,
Year = newyear, Year = (item.Years-1).ToString(),
Money = newmoney, Money = newmoney,
PlanNum = item.PlanCount, PlanNum = item.PlanCount,
MajorId = item.Id, MajorId = item.Id,