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

feat:调整查询接口

develop
old易 2024-01-26 13:27:02 +08:00
parent b86b9c7464
commit 3c1cc01b0f
9 changed files with 172 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -32,12 +32,15 @@ namespace New_College.Api.Controllers.Front
private readonly IU_VolunteerTableDetailServices _VolunteerTableDetailServices; private readonly IU_VolunteerTableDetailServices _VolunteerTableDetailServices;
private readonly IUnitOfWork _unitOfWork; private readonly IUnitOfWork _unitOfWork;
private readonly ID_PlanMajorDescServices _planMajorDescServices; private readonly ID_PlanMajorDescServices _planMajorDescServices;
public PcVolunteerController(IU_VolunteerTableServices volunteerTableServices, IU_VolunteerTableDetailServices volunteerTableDetailServices, IUnitOfWork unitOfWork, ID_PlanMajorDescServices planMajorDescServices) private readonly IT_TbSNeedDataInfoServices _TbSNeedDataInfoServices;
public PcVolunteerController(IU_VolunteerTableServices volunteerTableServices, IU_VolunteerTableDetailServices volunteerTableDetailServices,
IUnitOfWork unitOfWork, ID_PlanMajorDescServices planMajorDescServices, IT_TbSNeedDataInfoServices tbSNeedDataInfoServices)
{ {
_VolunteerTableServices = volunteerTableServices; _VolunteerTableServices = volunteerTableServices;
_VolunteerTableDetailServices = volunteerTableDetailServices; _VolunteerTableDetailServices = volunteerTableDetailServices;
_unitOfWork = unitOfWork; _unitOfWork = unitOfWork;
_planMajorDescServices = planMajorDescServices; _planMajorDescServices = planMajorDescServices;
_TbSNeedDataInfoServices = tbSNeedDataInfoServices;
} }

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

@ -6955,16 +6955,6 @@
院校编码 院校编码
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.UniversityEnrollmentPlanResult.Sff">
<summary>
是否211
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityEnrollmentPlanResult.Syl">
<summary>
是否双一流
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityEnrollmentPlanResult._SYL"> <member name="P:New_College.Model.ViewModels.UniversityEnrollmentPlanResult._SYL">
<summary> <summary>
@ -6995,6 +6985,11 @@
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.PlanDescList.Subject">
<summary>
选科
</summary>
</member>
<member name="T:New_College.Model.ViewModels.CWBEnrollmentPlanResult"> <member name="T:New_College.Model.ViewModels.CWBEnrollmentPlanResult">
<summary> <summary>
冲稳保返回 冲稳保返回

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

@ -33,6 +33,8 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public string UserPwd { get; set; } public string UserPwd { get; set; }
public string UserCode { get; set; }
/// <summary> /// <summary>
/// 用户头像 /// 用户头像
/// </summary> /// </summary>

1
New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
View File

@ -349,6 +349,7 @@ namespace New_College.Model.ViewModels
/// 位次 /// 位次
/// </summary> /// </summary>
public int RankLine { get; set; } public int RankLine { get; set; }
///// <summary> ///// <summary>
///// 最低分 ///// 最低分
///// </summary> ///// </summary>

2
New_College.Model/ViewModels/Result/CustomerInfoResult.cs
View File

@ -89,6 +89,8 @@ namespace New_College.Model.ViewModels
public CustomerTypeEnum CustomerType { get; set; } public CustomerTypeEnum CustomerType { get; set; }
public string UserCode { get; set; }
/// <summary> /// <summary>
/// 学届 /// 学届
/// </summary> /// </summary>

38
New_College.Model/ViewModels/Result/VolunteerResult.cs
View File

@ -90,15 +90,17 @@ namespace New_College.Model.ViewModels
public string AreaName { get; set; } public string AreaName { get; set; }
public int? Nhef { get; set; } public string CityName { get; set; }
/// <summary>
/// 是否211 //public int? Nhef { get; set; }
/// </summary> ///// <summary>
public int? Sff { get; set; } ///// 是否211
/// <summary> ///// </summary>
/// 是否双一流 //public int? Sff { get; set; }
/// </summary> ///// <summary>
public int? Syl { get; set; } ///// 是否双一流
///// </summary>
//public int? Syl { get; set; }
public string _985 { get; set; } public string _985 { get; set; }
@ -121,13 +123,14 @@ namespace New_College.Model.ViewModels
///// </summary> ///// </summary>
//public string RankLine { get; set; } //public string RankLine { get; set; }
public float Scoreline { get; set; } public int SchoolLowScore { get; set; }
public float SchoolScoreline { get; set; }
public int planCount { get; set; } public int planCount { get; set; }
public int PlanId { get; set; } //public int PlanId { get; set; }
/// <summary> /// <summary>
/// 对应的Ids /// 对应的Ids
/// </summary> /// </summary>
public List<int> PlanIds { get; set; } public List<long> PlanIds { get; set; }
/// <summary> /// <summary>
/// 对应专业数 /// 对应专业数
@ -145,6 +148,8 @@ namespace New_College.Model.ViewModels
//public string BatchtypeId { get; set; } //public string BatchtypeId { get; set; }
public string Web { get; set; } public string Web { get; set; }
public string AscriptionName { get; set; } public string AscriptionName { get; set; }
public int Percentage { get; set; }
} }
/// <summary> /// <summary>
@ -156,7 +161,7 @@ namespace New_College.Model.ViewModels
public int PlanNum { get; set; } public int PlanNum { get; set; }
public string Year { get; set; } public string Year { get; set; }
public string Money { get; set; } public string Money { get; set; }
public int MajorId { get; set; } public long MajorId { get; set; }
public float Scoreline { get; set; } public float Scoreline { get; set; }
/// <summary> /// <summary>
@ -168,6 +173,13 @@ namespace New_College.Model.ViewModels
/// ///
/// </summary> /// </summary>
public int Percentage { get; set; } public int Percentage { get; set; }
/// <summary>
/// 选科
/// </summary>
public string Subject { get; set; }
public List<PlanItem> planItems { get; set; }
} }
/// <summary> /// <summary>

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

@ -30,6 +30,7 @@ namespace New_College.Repository
private readonly ID_PlanMajorScoreLineRepository planMajorScoreLine; private readonly ID_PlanMajorScoreLineRepository planMajorScoreLine;
private readonly ID_UniversityRepository d_University; private readonly ID_UniversityRepository d_University;
private readonly ISysRegionRepository _sysRegionRepository; private readonly ISysRegionRepository _sysRegionRepository;
private readonly IT_TbSNeedDataInfoRepository t_TbSNeedDataInfo;
public T_EnrollmentPlanedescRepository(IUnitOfWork unitOfWork, public T_EnrollmentPlanedescRepository(IUnitOfWork unitOfWork,
IV_CustomerInfoRepository _CustomerInfoRepository, IV_CustomerInfoRepository _CustomerInfoRepository,
IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository, IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository,
@ -37,7 +38,8 @@ namespace New_College.Repository
ID_PlanMajorDescRepository planMajorDesc, ID_PlanMajorDescRepository planMajorDesc,
ID_PlanMajorScoreLineRepository planMajorScoreLine, ID_PlanMajorScoreLineRepository planMajorScoreLine,
ID_UniversityRepository d_University, ID_UniversityRepository d_University,
ISysRegionRepository sysRegionRepository) : base(unitOfWork) ISysRegionRepository sysRegionRepository,
IT_TbSNeedDataInfoRepository tbSNeedDataInfo) : base(unitOfWork)
{ {
this.v_CustomerInfo = _CustomerInfoRepository; this.v_CustomerInfo = _CustomerInfoRepository;
this.t_EnrollmentPlane = t_EnrollmentPlaneRepository; this.t_EnrollmentPlane = t_EnrollmentPlaneRepository;
@ -46,6 +48,7 @@ namespace New_College.Repository
this.planMajorScoreLine = planMajorScoreLine; this.planMajorScoreLine = planMajorScoreLine;
this.d_University = d_University; this.d_University = d_University;
this._sysRegionRepository = sysRegionRepository; this._sysRegionRepository = sysRegionRepository;
this.t_TbSNeedDataInfo = tbSNeedDataInfo;
} }
@ -83,34 +86,56 @@ namespace New_College.Repository
// return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选专业大类数据完善中..." }; // return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选专业大类数据完善中..." };
majornames = majoraslist.Select(x => x.MajorCode).ToList(); majornames = majoraslist.Select(x => x.MajorCode).ToList();
} }
var recommendInfo = await this.Db.Queryable<D_PlanMajorDesc>()
.WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.AreaName))
.WhereIF(query.Year > 0, p => p.Years == query.Year)
var recommandinfo = await this.Db.Queryable<T_TbSNeedDataInfo>()
.WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.Province))
//.WhereIF(query.Year > 0, p => p.Years == query.Year)
.WhereIF(!string.IsNullOrEmpty(query.Location), p => p.Location == query.Location) .WhereIF(!string.IsNullOrEmpty(query.Location), p => p.Location == query.Location)
.WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) // .WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName)
.WhereIF(string.IsNullOrWhiteSpace(query.Type), p => p.LowScore > 0 && (p.LowScore <= query.Score + 15)) .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15))
.WhereIF(query.Type == "冲", p => p.LowScore > 0 && (p.LowScore <= query.Score + 15 && p.LowScore > query.Score + 5)) .WhereIF(query.Type == "冲", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15 && int.Parse(p._23Score) > query.Score + 5))
.WhereIF(query.Type == "稳", p => p.LowScore > 0 && (p.LowScore <= query.Score + 5 && p.LowScore > query.Score - 15)) .WhereIF(query.Type == "稳", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 5 && int.Parse(p._23Score) > query.Score - 15))
.WhereIF(query.Type == "保", p => p.LowScore > 0 && (p.LowScore < query.Score - 15)) .WhereIF(query.Type == "保", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) < query.Score - 15))
.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p.SelectSubject, sbuOne) || SqlFunc.Contains(p.SelectSubject, sbuTwo) || SqlFunc.Contains(p.SelectSubject, sbuTree))) .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p._23subject, sbuOne) || SqlFunc.Contains(p._23subject, sbuTwo) || SqlFunc.Contains(p._23subject, sbuTree)))
.WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode)) .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode))
.WhereIF(query.UniversityIds.Any() && query.UniversityIds.Count() > 0, p => SqlFunc.ContainsArray(query.UniversityIds, p.UId)) //.WhereIF(query.UniversityIds.Any() && query.UniversityIds.Count() > 0, p => SqlFunc.ContainsArray(query.UniversityIds, p.UId))
.Select(p => new UniversityEnrollmentPlanResult() .Select(p => new UniversityEnrollmentPlanResult()
{ {
UniversityId = p.UId, // UniversityId = p.UId,
PlanId = p.Id, //PlanId = p.Id,
// Scoreline = p.LowScore // Scoreline = p.LowScore
}) })
.ToListAsync(); .ToListAsync();
var universitylist = recommendInfo.Select(c => c.UniversityId).Distinct().ToList(); // var recommendInfo = await this.Db.Queryable<D_PlanMajorDesc>()
universitylist.ForEach(a => // .WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.AreaName))
{ //.WhereIF(query.Year > 0, p => p.Years == query.Year)
response.Add(new UniversityMapMajorItems() //.WhereIF(!string.IsNullOrEmpty(query.Location), p => p.Location == query.Location)
{ //.WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName)
UId = a, //.WhereIF(string.IsNullOrWhiteSpace(query.Type), p => p.LowScore > 0 && (p.LowScore <= query.Score + 15))
MIds = recommendInfo.Where(e => e.UniversityId == a).Select(c => c.PlanId).ToList() //.WhereIF(query.Type == "冲", p => p.LowScore > 0 && (p.LowScore <= query.Score + 15 && p.LowScore > query.Score + 5))
}); //.WhereIF(query.Type == "稳", p => p.LowScore > 0 && (p.LowScore <= query.Score + 5 && p.LowScore > query.Score - 15))
}); //.WhereIF(query.Type == "保", p => p.LowScore > 0 && (p.LowScore < query.Score - 15))
//.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p.SelectSubject, sbuOne) || SqlFunc.Contains(p.SelectSubject, sbuTwo) || SqlFunc.Contains(p.SelectSubject, sbuTree)))
//.WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode))
// .WhereIF(query.UniversityIds.Any() && query.UniversityIds.Count() > 0, p => SqlFunc.ContainsArray(query.UniversityIds, p.UId))
//.Select(p => new UniversityEnrollmentPlanResult()
//{
// UniversityId = p.UId,
// PlanId = p.Id,
// // Scoreline = p.LowScore
//})
//.ToListAsync();
// var universitylist = recommendInfo.Select(c => c.UniversityId).Distinct().ToList();
// universitylist.ForEach(a =>
// {
// response.Add(new UniversityMapMajorItems()
// {
// UId = a,
// MIds = recommendInfo.Where(e => e.UniversityId == a).Select(c => c.PlanId).ToList()
// });
// });
return new MessageModel<List<UniversityMapMajorItems>>() { response = response }; return new MessageModel<List<UniversityMapMajorItems>>() { response = response };
} }
@ -156,73 +181,45 @@ namespace New_College.Repository
return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选专业大类数据完善中..." }; return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选专业大类数据完善中..." };
majornames = majoraslist.Select(x => x.MajorName).ToList(); majornames = majoraslist.Select(x => x.MajorName).ToList();
} }
var recommendInfo = await this.Db.Queryable<T_TbSNeedDataInfo>()
.WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.Province))
var recommendInfo = await this.Db.Queryable<D_PlanMajorDesc>() //.WhereIF(query.Year > 0, p => p.Years == query.Year)
.WhereIF(regionlist.Any(), p => SqlFunc.ContainsArray(regionlist, p.AreaName))
.WhereIF(query.Year > 0, p => p.Years == query.Year)
.WhereIF(!string.IsNullOrEmpty(query.Location), p => p.Location == query.Location) .WhereIF(!string.IsNullOrEmpty(query.Location), p => p.Location == query.Location)
.WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName) //.WhereIF(!string.IsNullOrEmpty(query.BatchName), p => p.BatchName == query.BatchName)
.WhereIF(string.IsNullOrWhiteSpace(query.Type), p => p.LowScore > 0 && (p.LowScore <= query.Score + 15)) .WhereIF(string.IsNullOrWhiteSpace(query.Type), p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15))
.WhereIF(query.Type == "冲", p => p.LowScore > 0 && (p.LowScore <= query.Score + 15 && p.LowScore > query.Score + 5)) .WhereIF(query.Type == "冲", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 15 && int.Parse(p._23Score) > query.Score + 5))
.WhereIF(query.Type == "稳", p => p.LowScore > 0 && (p.LowScore <= query.Score + 5 && p.LowScore > query.Score - 15)) .WhereIF(query.Type == "稳", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) <= query.Score + 5 && int.Parse(p._23Score) > query.Score - 15))
.WhereIF(query.Type == "保", p => p.LowScore > 0 && (p.LowScore < query.Score - 15)) .WhereIF(query.Type == "保", p => int.Parse(p._23Score) > 0 && (int.Parse(p._23Score) < query.Score - 15))
.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p.SelectSubject, sbuOne) || SqlFunc.Contains(p.SelectSubject, sbuTwo) || SqlFunc.Contains(p.SelectSubject, sbuTree))) .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), p => (SqlFunc.Contains(p._23subject, sbuOne) || SqlFunc.Contains(p._23subject, sbuTwo) || SqlFunc.Contains(p._23subject, sbuTree)))
.WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.Major)).GroupBy(plans => new .WhereIF(majornames.Any() && majornames.Count() > 0, p => SqlFunc.ContainsArray(majornames, p.MajorCode))
{ .ToListAsync();
// plans.Id,
plans.UId,
plans.UniversityName,
plans.EnrollmentCode
//plans.AreaName,
//plans.Ownership,
//plans._211,
//plans._985,
//plans._SYL,
//plans.SubjectType,
// plans.LowScore,
// plans.LowScoreRank
})
.Select(p => new UniversityEnrollmentPlanResult()
{
// AreaName = p.AreaName,
UniversityId = p.UId,
// AscriptionName=p.Ownership,
//_211=p._211,
//_985=p._985,
//_SYL=p._SYL,
// Type= p.SubjectType,
// Logo = universitys.Logo,
// Nhef = universitys.Nhef,
// Rank = universitys.Rank <= 0 ? "--" : universitys.Rank.ToString(),
UniversityName = p.UniversityName,
UniversityCode = p.EnrollmentCode,
planCount = SqlFunc.AggregateSum(p.PlanCount),// plandesc.Where(x => x.UniversityId == item.Id).Select(x => x.Id).ToList()
//PlanIds= SqlFunc.Subqueryable<D_PlanMajorDesc>().Where(s=>s.Id==p.Id).ToList(s => s.Id),
MjaorPlan = SqlFunc.AggregateCount(p.UId),
Scoreline = SqlFunc.AggregateMin(p.LowScore),
var universitylist = recommendInfo.GroupBy(g => g.UniversityName).Select(c => new UniversityEnrollmentPlanResult() { UniversityName = c.Key }).ToList();
}).OrderBy(p => p.Scoreline, OrderByType.Desc) var universitytemps = (await d_University.Query(c => SqlFunc.ContainsArray(recommendInfo.Select(c => c.UniversityName).ToList(), c.Name))).Select(c => new
.ToPageListAsync(query.PageIndex, query.PageSize, totalNumber);
var universitylist = (await d_University.Query(c => SqlFunc.ContainsArray(recommendInfo.Select(c => c.UniversityId).ToList(), c.Id))).Select(c => new
D_University() D_University()
{ Id = c.Id, Logo = c.Logo }).ToList(); { Id = c.Id, Logo = c.Logo, Name = c.Name }).ToList();
recommendInfo.ForEach(a => var ulist = universitylist.Select(s => new UniversityEnrollmentPlanResult()
{ {
//a.AreaName = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Area_Name; Logo = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Logo,
//a.AscriptionName = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).AscriptionName; UniversityId = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Id,
a.Logo = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Logo; AreaName = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).Province,
//a.Nhef = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Nhef; UniversityCode = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).EnrollmentCode,
//a.Rank = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Rank.ToString(); Rank = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).UniversityRank.ToString(),
//a.Sff = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Sff; _985 = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel != null ? (recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel.Contains("985") ? "是" : "否") : "否",
//a.Syl = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Syl; _211 = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel != null ? (recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel.Contains("211") ? "是" : "否") : "否",
//a.AreaName = universitylist.FirstOrDefault(c => c.Id == a.UniversityId).Area_Name; _SYL = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel != null ? (recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).LnstitutionalLevel.Contains("双一流") ? "是" : "否") : "否",
//a.PlanIds =new List<int>() { 12123, 1212, 1212 }; SchoolScoreline = int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23SchoolScoreLine),
SchoolLowScore = int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23SchoolScore),
Type = MajorPlanScoreTool.GetPlanScore(int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23Score), (int)query.Score) == 2 ? "冲" : MajorPlanScoreTool.GetPlanScore(int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23Score), (int)query.Score) == 1 ? "稳" : "保",//冲稳保院校
Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName)._23Score), (int)query.Score),
AscriptionName = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).Ownership,
CityName = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName).City,
MjaorPlan = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Count(),
planCount = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Sum(m => int.Parse(m._23Count)),
PlanIds = recommendInfo.Where(e => e.UniversityName == s.UniversityName).Select(c => c.ID).ToList(),
UniversityName = s.UniversityName,
a.Type = (a.Scoreline <= chongfirst && a.Scoreline > chongend) ? "冲" : (a.Scoreline <= chongend && a.Scoreline > wenend) ? "稳" : "保"; }).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList();
});
return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>()
{ {
@ -230,11 +227,11 @@ namespace New_College.Repository
msg = "获取成功", msg = "获取成功",
response = new PageModel<UniversityEnrollmentPlanResult>() response = new PageModel<UniversityEnrollmentPlanResult>()
{ {
data = recommendInfo, data = ulist,
dataCount = recommendInfo.Count, dataCount = universitylist.Count,
page = query.PageIndex, page = query.PageIndex,
PageSize = query.PageSize, PageSize = query.PageSize,
pageCount = (int)Math.Ceiling(recommendInfo.Count / Convert.ToDecimal(query.PageSize)) pageCount = (int)Math.Ceiling(universitylist.Count / Convert.ToDecimal(query.PageSize))
} }
}; };
} }

55
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -18,6 +18,7 @@ using Org.BouncyCastle.Asn1.Ocsp;
using SqlSugar; using SqlSugar;
using System.Linq.Expressions; using System.Linq.Expressions;
using static New_College.Services.T_EnrollmentPlaneServices; using static New_College.Services.T_EnrollmentPlaneServices;
using NPOI.SS.Formula.Functions;
namespace New_College.Services namespace New_College.Services
{ {
@ -44,6 +45,7 @@ namespace New_College.Services
private readonly ID_QualificationLineRepository _QualificationLineRepository; private readonly ID_QualificationLineRepository _QualificationLineRepository;
private readonly ID_ScoreLineRepository _ScoreLineRepository; private readonly ID_ScoreLineRepository _ScoreLineRepository;
private readonly IT_BatchlineRepository t_BatchlineRepository; private readonly IT_BatchlineRepository t_BatchlineRepository;
private readonly IT_TbSNeedDataInfoRepository t_TbSNeedDataInfoRepository;
public T_EnrollmentPlanedescServices(IBaseRepository<T_EnrollmentPlanedesc> dal public T_EnrollmentPlanedescServices(IBaseRepository<T_EnrollmentPlanedesc> dal
, ID_UniversityRepository ID_UniversityRepository , ID_UniversityRepository ID_UniversityRepository
, IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository , IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository
@ -60,7 +62,8 @@ namespace New_College.Services
, ID_UniversityCollectionRepository ID_UniversityCollectionRepository , ID_UniversityCollectionRepository ID_UniversityCollectionRepository
, IT_GearInfoRepository IT_GearInfoRepository, IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescServices, , IT_GearInfoRepository IT_GearInfoRepository, IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescServices,
IV_CustomerInfoRepository v_CustomerInfoRepository, ID_PlanMajorDescRepository planMajorDescRepository, IV_CustomerInfoRepository v_CustomerInfoRepository, ID_PlanMajorDescRepository planMajorDescRepository,
ID_PlanMajorScoreLineRepository planMajorScoreLineRepository, ID_QualificationLineRepository qualificationLineRepository, ID_ScoreLineRepository scoreLineRepository, IT_BatchlineRepository batchlineRepository) ID_PlanMajorScoreLineRepository planMajorScoreLineRepository, ID_QualificationLineRepository qualificationLineRepository, ID_ScoreLineRepository scoreLineRepository,
IT_BatchlineRepository batchlineRepository, IT_TbSNeedDataInfoRepository tbSNeedDataInfoRepository)
{ {
this._dal = dal; this._dal = dal;
d_UniversityRepository = ID_UniversityRepository; d_UniversityRepository = ID_UniversityRepository;
@ -84,6 +87,7 @@ namespace New_College.Services
_QualificationLineRepository = qualificationLineRepository; _QualificationLineRepository = qualificationLineRepository;
_ScoreLineRepository = scoreLineRepository; _ScoreLineRepository = scoreLineRepository;
t_BatchlineRepository = batchlineRepository; t_BatchlineRepository = batchlineRepository;
t_TbSNeedDataInfoRepository = tbSNeedDataInfoRepository;
} }
public List<string> permut = new List<string>(); public List<string> permut = new List<string>();
@ -584,36 +588,47 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
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 t_TbSNeedDataInfoRepository.QueryPage(x => SqlFunc.ContainsArray(query.PlanIds, x.ID), query.PageIndex, query.PageSize, "UniversityRank asc");
int tpyear = info.data.FirstOrDefault().Years; // int tpyear = info.data.FirstOrDefault().Years;
string tpname = info.data.FirstOrDefault().UniversityName; string tpname = info.data.FirstOrDefault().UniversityName;
string location = info.data.FirstOrDefault().Location; 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.MajorName;
var newmoney = string.IsNullOrWhiteSpace(item.Free) || item.Free == "0" || item.Free == "待定" ? "--" : item.Free; var newmoney = string.IsNullOrWhiteSpace(item.Fee) || item.Fee == "0" || item.Fee == "待定" ? "--" : item.Fee;
// var newyear = string.IsNullOrWhiteSpace(item.AcademicYear) ? "--" : item.AcademicYear; //var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore);
// var newyear = planmajorlist.FirstOrDefault().Years.ToString(); //if (count > 0)
// 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; // continue;
var count = list.Count(x => x.Name == newname && x.Money == newmoney && x.PlanNum == item.PlanCount && x.Scoreline == item.LowScore);
if (count > 0)
continue;
list.Add(new PlanDescList() list.Add(new PlanDescList()
{ {
Name = newname, Name = newname,
Year = (item.Years - 1).ToString(), Year = "2023",
Money = newmoney, Money = newmoney,
PlanNum = item.PlanCount, PlanNum = int.Parse(item._23Count),
MajorId = item.Id, MajorId = item.ID,
Scoreline = item.LowScore, Scoreline = int.Parse(item._23ScoreLine),
Type = MajorPlanScoreTool.GetPlanScore(item.LowScore, query.Score),//还缺冲稳保 Type = MajorPlanScoreTool.GetPlanScore(int.Parse(item._23Score), query.Score),//还缺冲稳保
Percentage = MajorPlanScoreTool.GetPlanPercentage(item.LowScore, query.Score), Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(item._23Score), query.Score),
//Subject = GetSub(item.Subjectclaim) Subject = item._23subject,
planItems = new List<PlanItem>()
{
new PlanItem() {
PlanCount=int.Parse(item._22Count),
RankLine=int.Parse(item._22ScoreLine),
Scoreline=int.Parse(item._22Score),
Year="2022"
},
new PlanItem() {
PlanCount=int.Parse(item._21Count),
RankLine=int.Parse(item._21ScoreLine),
Scoreline=int.Parse(item._21Score),
Year="2021"
},
}
}); });
} }
return new MessageModel<PageModel<PlanDescList>>() return new MessageModel<PageModel<PlanDescList>>()

10
New_College.Services/V_CustomerInfoServices.cs
View File

@ -50,6 +50,14 @@ namespace New_College.Services
var salt = RadomHelper.RandCode(6); var salt = RadomHelper.RandCode(6);
info.UserPwd = MD5Helper.MD5Encrypt16(query.UserPwd + salt); info.UserPwd = MD5Helper.MD5Encrypt16(query.UserPwd + salt);
} }
if (!string.IsNullOrWhiteSpace(query.UserCode))
{
info.UserCode =query.UserCode;
}
var result = await _dal.Update(info); var result = await _dal.Update(info);
return new CustomerInfoResult() return new CustomerInfoResult()
{ {
@ -179,6 +187,7 @@ namespace New_College.Services
{ {
info.ClassName = query.ClassName; info.ClassName = query.ClassName;
} }
var result = await _dal.Update(info); var result = await _dal.Update(info);
if (result) if (result)
{ {
@ -233,6 +242,7 @@ namespace New_College.Services
response = new CustomerInfoResult() response = new CustomerInfoResult()
{ {
AvatarUrl = info.AvatarUrl, AvatarUrl = info.AvatarUrl,
UserCode = info.UserCode,
Gender = info.Gender, Gender = info.Gender,
Id = info.Id, Id = info.Id,
OpenId = info.OpenId, OpenId = info.OpenId,