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

feat:待最新批次出来完善

develop
old易 2024-06-21 13:46:06 +08:00
parent f8f069285d
commit b36343c2d1
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
New_College.Api/Controllers/Front/EnrollMentPlansController.cs
View File

@ -43,7 +43,7 @@ namespace New_College.Api.Controllers.Front
{ {
try try
{ {
request.Years = request.Years >= 2023 ? 2023 : request.Years; request.Years = request.Years > 2024 ? 2024 : request.Years;
Expression<Func<D_PlanMajorDesc, bool>> whereexp = Expressionable.Create<D_PlanMajorDesc>() //创建表达式 Expression<Func<D_PlanMajorDesc, bool>> whereexp = Expressionable.Create<D_PlanMajorDesc>() //创建表达式
.And(c => c.Location == request.Location) .And(c => c.Location == request.Location)
.And(c => c.Years == request.Years) .And(c => c.Years == request.Years)

2
New_College.Repository/BASE/D_PlanMajorDescProRepository.cs
View File

@ -43,7 +43,7 @@ namespace New_College.Repository
{ {
RefAsync<int> totalCount = 0; RefAsync<int> totalCount = 0;
var pageresult = new PageModel<UniversityPlanProView>(); var pageresult = new PageModel<UniversityPlanProView>();
request.Year = request.Year > DateTime.Now.Year - 1 ? DateTime.Now.Year - 1 : request.Year; request.Year = request.Year > 2024 ? 2024 : request.Year;
var pagelist = await this.Db.Queryable<D_PlanMajorDescPro>().Where(c => c.Location == request.Location) var pagelist = await this.Db.Queryable<D_PlanMajorDescPro>().Where(c => c.Location == request.Location)
.Where(c => c.Years == request.Year) .Where(c => c.Years == request.Year)
.WhereIF(request.Sff.HasValue, c => c._211 == (request.Sff == 1 ? "是" : "否")) .WhereIF(request.Sff.HasValue, c => c._211 == (request.Sff == 1 ? "是" : "否"))

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

@ -59,7 +59,7 @@ namespace New_College.Repository
public async Task<MessageModel<List<UniversityMapMajorItems>>> GetUniversityMapItems(CWBUniversityDetailQuery query) public async Task<MessageModel<List<UniversityMapMajorItems>>> GetUniversityMapItems(CWBUniversityDetailQuery query)
{ {
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
var response = new List<UniversityMapMajorItems>(); var response = new List<UniversityMapMajorItems>();
RefAsync<int> totalNumber = 0; RefAsync<int> totalNumber = 0;
var regionlist = this.Db.Queryable<SysRegion>().Where(c => c.Level == 1).WhereIF(query.provinceIds != null && query.provinceIds.Any(), c => SqlFunc.ContainsArray(query.provinceIds, c.KeyId)).Select(c => c.RegionName).ToList(); var regionlist = this.Db.Queryable<SysRegion>().Where(c => c.Level == 1).WhereIF(query.provinceIds != null && query.provinceIds.Any(), c => SqlFunc.ContainsArray(query.provinceIds, c.KeyId)).Select(c => c.RegionName).ToList();
@ -151,7 +151,7 @@ namespace New_College.Repository
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<PageModel<UniversityEnrollmentPlanResult>>> GetCWBUniversityDetail(CWBUniversityDetailQuery query) public async Task<MessageModel<PageModel<UniversityEnrollmentPlanResult>>> GetCWBUniversityDetail(CWBUniversityDetailQuery query)
{ {
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
RefAsync<int> totalNumber = 0; RefAsync<int> totalNumber = 0;
if (query.provinceIds == null) if (query.provinceIds == null)
{ {
@ -345,7 +345,7 @@ namespace New_College.Repository
RefAsync<int> totalNumber = 0; RefAsync<int> totalNumber = 0;
var maxscore = query.Score + 15; var maxscore = query.Score + 15;
var minscore = query.Score - 60; var minscore = query.Score - 60;
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
//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;
//} //}

2
New_College.Services/D_PlanMajorDescProServices.cs
View File

@ -38,7 +38,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MajorPlanProView> GetMajorPlanPro(MajorPlanProViewQuery request) public async Task<MajorPlanProView> GetMajorPlanPro(MajorPlanProViewQuery request)
{ {
request.Year = request.Year > (DateTime.Now.Year - 1) ? (DateTime.Now.Year - 1) : request.Year; request.Year = request.Year > 2024 ? 2024 : request.Year;
var majorview = new MajorPlanProView(); var majorview = new MajorPlanProView();
Expression<Func<D_PlanMajorDescPro, bool>> expression = Expressionable.Create<D_PlanMajorDescPro>() Expression<Func<D_PlanMajorDescPro, bool>> expression = Expressionable.Create<D_PlanMajorDescPro>()
.And(c => c.UId == request.UId) .And(c => c.UId == request.UId)

4
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -178,7 +178,7 @@ namespace New_College.Services
var pagemodel = new AIGOPageModel<AIGOResponse>(); var pagemodel = new AIGOPageModel<AIGOResponse>();
int startscore = request.Score - 60; int startscore = request.Score - 60;
int endscore = request.Score + 15; int endscore = request.Score + 15;
int qyear = request.Year >= 2023 ? 2023 : request.Year; int qyear = request.Year > 2024 ? 2024 : request.Year;
string batchtypeName = request.SubjectClaim.Length > 2 ? "综合" : request.SubjectClaim; string batchtypeName = request.SubjectClaim.Length > 2 ? "综合" : request.SubjectClaim;
request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim; request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim;
@ -361,7 +361,7 @@ namespace New_College.Services
} }
//request.PageSize = 150;//山东省 //request.PageSize = 150;//山东省
request.Year = request.Year > 2023 ? 2023 : request.Year; request.Year = request.Year > 2024 ? 2024 : request.Year;
// var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); // var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
Expression<Func<T_TbSNeedDataInfo, bool>> expression3 = Expressionable.Create<T_TbSNeedDataInfo>() Expression<Func<T_TbSNeedDataInfo, bool>> expression3 = Expressionable.Create<T_TbSNeedDataInfo>()
.And(c => c.Location == request.Location) .And(c => c.Location == request.Location)

12
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -415,7 +415,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<List<UniversityEnrollmentPlanLazyResult>>> GetEnrollmentLazyByPage(LazyEnrollmentPlaneQuery query) public async Task<MessageModel<List<UniversityEnrollmentPlanLazyResult>>> GetEnrollmentLazyByPage(LazyEnrollmentPlaneQuery query)
{ {
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
if (query.Score <= 0) if (query.Score <= 0)
return new MessageModel<List<UniversityEnrollmentPlanLazyResult>>() { success = false, msg = "分数不能为0..." }; return new MessageModel<List<UniversityEnrollmentPlanLazyResult>>() { success = false, msg = "分数不能为0..." };
//var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); //var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId);
@ -886,7 +886,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<UniversityProbabilityResult>> GetUniversityProbability(UniversityProbabilityQuery query) public async Task<MessageModel<UniversityProbabilityResult>> GetUniversityProbability(UniversityProbabilityQuery query)
{ {
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
var universityinfoline = await _QualificationLineRepository.Query(c => c.UId == query.UniversityId); var universityinfoline = await _QualificationLineRepository.Query(c => c.UId == query.UniversityId);
if (universityinfoline == null) if (universityinfoline == null)
return new MessageModel<UniversityProbabilityResult>() { success = false, msg = "院校信息不存在" }; return new MessageModel<UniversityProbabilityResult>() { success = false, msg = "院校信息不存在" };
@ -1208,7 +1208,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<List<SimuVolunteerTableResult>>> GetAutoVolunteerTableDetail(VolunteerTableQuery query) public async Task<MessageModel<List<SimuVolunteerTableResult>>> GetAutoVolunteerTableDetail(VolunteerTableQuery query)
{ {
string yearName = "2023"; string yearName = "2024";
if (query.details == null) if (query.details == null)
return new MessageModel<List<SimuVolunteerTableResult>>() { success = false, msg = "选择专业院校为空..." }; return new MessageModel<List<SimuVolunteerTableResult>>() { success = false, msg = "选择专业院校为空..." };
List<SimuVolunteerTableResult> list = new List<SimuVolunteerTableResult>() { }; List<SimuVolunteerTableResult> list = new List<SimuVolunteerTableResult>() { };
@ -1297,7 +1297,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<List<SimuVolunteerTableResult>>> GetHollandVolunteerTableDetail(HollandVolunteerTableQuery query) public async Task<MessageModel<List<SimuVolunteerTableResult>>> GetHollandVolunteerTableDetail(HollandVolunteerTableQuery query)
{ {
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId);
if (planinfo.Count <= 0) if (planinfo.Count <= 0)
return new MessageModel<List<SimuVolunteerTableResult>>() { success = false, msg = "传入年份省份有误" }; return new MessageModel<List<SimuVolunteerTableResult>>() { success = false, msg = "传入年份省份有误" };
@ -1377,7 +1377,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<string>> GetSubjectSelectByTag(ByTagSubjectSelectQuery query) public async Task<MessageModel<string>> GetSubjectSelectByTag(ByTagSubjectSelectQuery query)
{ {
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId);
if (planinfo == null) if (planinfo == null)
return new MessageModel<string>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." }; return new MessageModel<string>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." };
@ -1463,7 +1463,7 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<MessageModel<List<MajorPlanResult>>> GetMajorPlanClaim(CustomerQuery query) public async Task<MessageModel<List<MajorPlanResult>>> GetMajorPlanClaim(CustomerQuery query)
{ {
query.Year = query.Year > 2023 ? 2023 : query.Year; query.Year = query.Year > 2024 ? 2024 : query.Year;
//查招生计划 //查招生计划
var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId);
if (planinfo == null) if (planinfo == null)

2
New_College.Services/V_CustomerInfoServices.cs
View File

@ -356,7 +356,7 @@ namespace New_College.Services
var info = await _dal.QueryById(query.Id); var info = await _dal.QueryById(query.Id);
if (info == null || info.IsDelete) if (info == null || info.IsDelete)
return new MessageModel<CustomerInfoResult>() { success = false, msg = "获取失败，用户信息为空" }; return new MessageModel<CustomerInfoResult>() { success = false, msg = "获取失败，用户信息为空" };
var years = info.Year > 2023 ? 2023 : info.Year; var years = info.Year;
string typename = "综合"; string typename = "综合";
if (info.subjectgroupName != null) if (info.subjectgroupName != null)