diff --git a/New_College.Api/Controllers/Front/EnrollMentPlansController.cs b/New_College.Api/Controllers/Front/EnrollMentPlansController.cs new file mode 100644 index 0000000..ddafd69 --- /dev/null +++ b/New_College.Api/Controllers/Front/EnrollMentPlansController.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using New_College.IServices; +using New_College.Model; +using New_College.Model.ViewModels.Query; +using New_College.Model.ViewModels.Result; + +namespace New_College.Api.Controllers.Front +{ + + /// + ///招生计划 + /// + [Route("api/front/[controller]/[action]")] + [ApiController] + public class EnrollMentPlansController : ControllerBase + { + private readonly IT_EnrollmentPlaneServices t_EnrollmentPlane; + public EnrollMentPlansController(IT_EnrollmentPlaneServices enrollmentPlaneServices) + { + this.t_EnrollmentPlane = enrollmentPlaneServices; + } + + + /// + /// 根据院校和专业获取招生计划列表 + /// + /// + /// + [HttpGet] + public async Task>> GetEnrollmentPlans([FromQuery] EnrollmentPlanRequest request) + { + try + { + var planinfo = await this.t_EnrollmentPlane.Query(e => e.IsDelete == false && e.Area_Id == request.AreaId && e.Years == request.Years); + if (planinfo.Any()) + { + request.PlanId = planinfo.FirstOrDefault().Id; + var result = await this.t_EnrollmentPlane.GetEnrollmentPlans(request); + return new MessageModel>() + { + msg = "success", + response = result, + success = true + }; + } + else + { + return new MessageModel>() + { + msg = "相关信息更新中...", + }; + } + } + catch (Exception ex) + { + return new MessageModel>() + { + msg = ex.Message + }; + } + } + + + + + } +} diff --git a/New_College.Api/Controllers/Front/FrontSelectionController.cs b/New_College.Api/Controllers/Front/FrontSelectionController.cs new file mode 100644 index 0000000..d56bb2c --- /dev/null +++ b/New_College.Api/Controllers/Front/FrontSelectionController.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using LinqKit; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using New_College.IServices; +using New_College.Model; +using New_College.Model.Models; +using New_College.Model.Request; + +namespace New_College.Api.Controllers.Front +{ + + /// + /// 新高考选科 + /// + [Route("api/[controller]")] + [ApiController] + //[Authorize] + public class FrontSelectionController : ControllerBase + { + private readonly ISubjectSelectionServices _selectionServices; + public FrontSelectionController(ISubjectSelectionServices subjectSelection) + { + this._selectionServices = subjectSelection; + } + + + + /// + /// 根据院校和专业名称查询选科组合情况 + /// + /// + /// + [HttpGet] + public async Task>> GetSubjectSelects([FromQuery] SelectionServiceRequest request) + { + try + { + var wheres = PredicateBuilder.New(); + + if (request.UniversityName.Any()) + { + request.UniversityName.ForEach(a => { + wheres = wheres.Or(x => x.UniversityName.Contains(a)); + }); + + } + + if (request.MajorName.Any()) + { + request.UniversityName.ForEach(a => { + wheres = wheres.Or(x => x.MajorName.Contains(a)); + }); + } + var subjectlist = await _selectionServices.QueryPage(wheres, request.PageIndex, request.PageSize); + + return new MessageModel>() + { + msg = "success", + response = subjectlist, + success = true + }; + } + catch (Exception ex) + { + return new MessageModel>() + { + msg = ex.Message + }; + } + } + + + + + } +} diff --git a/New_College.Api/Controllers/Front/NewsInfoController.cs b/New_College.Api/Controllers/Front/NewsInfoController.cs index 57dcf69..ec079bd 100644 --- a/New_College.Api/Controllers/Front/NewsInfoController.cs +++ b/New_College.Api/Controllers/Front/NewsInfoController.cs @@ -63,6 +63,48 @@ namespace New_College.Api.Controllers.Front } + + /// + /// 所有新闻列表带分页 + /// + /// + /// + [HttpGet] + public async Task>> GetPageNews([FromQuery] NewsPageRequest request) + { + var pageresponse = new PageModel(); + try + { + var pageinfo = await d_NewsInfo.QueryPage(w => w.CategoryId == request.CategoryId, request.PageIndex, request.PageSize); + if (pageinfo.data.Any()) + { + pageresponse.data = pageinfo.data.Select(s => new NewsInfoResponse() + { + CoverImg = s.CoverImg, + CreateTime = s.CreateTime.Value, + Id = s.Id, + Title = s.Title + }).ToList(); + } + return new MessageModel>() + { + msg = "success", + response = pageresponse, + success = true + }; + + } + catch (Exception ex) + { + return new MessageModel>() + { + msg = "fail", + success = false + }; + } + } + + /// /// 根据Id 获取新闻详情 /// diff --git a/New_College.Api/Controllers/Front/VolunteerController.cs b/New_College.Api/Controllers/Front/VolunteerController.cs index 85c210c..e18a121 100644 --- a/New_College.Api/Controllers/Front/VolunteerController.cs +++ b/New_College.Api/Controllers/Front/VolunteerController.cs @@ -85,11 +85,11 @@ namespace New_College.Api.Controllers.Front /// 根据年份省份获取批次 /// /// - [HttpGet] - public async Task>> GetBatchByAreaAndYear([FromQuery] BatchQuery query) - { - return await t_EnrollmentPlanedescServices.GetBatchByAreaAndYear(query); - } + //[HttpGet] + //public async Task>> GetBatchByAreaAndYear([FromQuery] BatchQuery query) + //{ + // return await t_EnrollmentPlanedescServices.GetBatchByAreaAndYear(query); + //} /// /// 冲稳保获取推荐学校专业 diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index 3879a3c..024ecd0 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -200,6 +200,11 @@ 虚假学校1,0为正规学校 + + + + + 专业二级分类id @@ -1256,6 +1261,11 @@ 是否删除 + + + + + 省市区 @@ -2879,6 +2889,56 @@ 年份 + + + 编号id + + + + + 账号 key + + + + + vip 卡类别id + + + + + 编号id + + + + + 账号 key + + + + + 卡片类别 + + + + + 是否绑定 + + + + + 卡类型名称 + + + + + 金额 + + + + + 天数 + + @@ -3344,11 +3404,6 @@ 年份 - - - 省份Id - - 省份名称 @@ -3469,16 +3524,6 @@ 学校省份 - - - 省市区名称 - - - - - 省份Id - - 办学性质1、公立，2、私立 @@ -3489,7 +3534,7 @@ 高校级别 985传1 211传2 双一流传3 其他传0或者不传 - + 专业Ids @@ -3574,56 +3619,6 @@ 院校类型 （0，校友会 1,武书连 2,软科 3,QS 4,U.S.News） - - - 编号id - - - - - 账号 key - - - - - vip 卡类别id - - - - - 编号id - - - - - 账号 key - - - - - 卡片类别 - - - - - 是否绑定 - - - - - 卡类型名称 - - - - - 金额 - - - - - 天数 - - vip卡类型id @@ -4119,6 +4114,31 @@ 文章内容 + + + 招生计划详情Id + + + + + 院校名称 + + + + + 批次名称 + + + + + 专业名称 + + + + + 招生人数 + + 省份名称 diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml index adedd83..b0f600f 100644 --- a/New_College.Api/New_College.xml +++ b/New_College.Api/New_College.xml @@ -150,6 +150,18 @@ + + + 招生计划 + + + + + 根据院校和专业获取招生计划列表 + + + + 获取考试时间 @@ -175,6 +187,18 @@ + + + 新高考选科 + + + + + 根据院校和专业名称查询选科组合情况 + + + + 获取院校库 @@ -318,6 +342,13 @@ + + + 所有新闻列表带分页 + + + + 根据Id 获取新闻详情 @@ -560,12 +591,6 @@ - - - 根据年份省份获取批次 - - - 冲稳保获取推荐学校专业 diff --git a/New_College.IServices/ISubjectSelectionServices.cs b/New_College.IServices/ISubjectSelectionServices.cs new file mode 100644 index 0000000..22cd085 --- /dev/null +++ b/New_College.IServices/ISubjectSelectionServices.cs @@ -0,0 +1,16 @@ +using New_College.IServices.BASE; +using New_College.Model.Models; + +namespace New_College.IServices +{ + /// + /// ISubjectSelectionServices + /// + public interface ISubjectSelectionServices :IBaseServices + { + + + + + } +} \ No newline at end of file diff --git a/New_College.IServices/IT_EnrollmentPlaneServices.cs b/New_College.IServices/IT_EnrollmentPlaneServices.cs index a2ac542..aeff9ac 100644 --- a/New_College.IServices/IT_EnrollmentPlaneServices.cs +++ b/New_College.IServices/IT_EnrollmentPlaneServices.cs @@ -1,14 +1,27 @@ using New_College.IServices.BASE; using New_College.Model.Models; +using New_College.Model.ViewModels.Query; +using New_College.Model.ViewModels.Result; +using System.Collections.Generic; using System.Threading.Tasks; namespace New_College.IServices -{ - /// - /// IT_EnrollmentPlaneServices - /// - public interface IT_EnrollmentPlaneServices :IBaseServices - { - Task Import(); - } +{ + /// + /// IT_EnrollmentPlaneServices + /// + public interface IT_EnrollmentPlaneServices : IBaseServices + { + Task Import(); + + + /// + /// 根据大学或者专业获取招生计划 + /// + /// + /// + Task> GetEnrollmentPlans(EnrollmentPlanRequest request); + + + } } \ No newline at end of file diff --git a/New_College.Model/Models/D_FackUniversity.cs b/New_College.Model/Models/D_FackUniversity.cs index 2d37a74..7d5cd98 100644 --- a/New_College.Model/Models/D_FackUniversity.cs +++ b/New_College.Model/Models/D_FackUniversity.cs @@ -25,5 +25,11 @@ namespace New_College.Model.Models public int Type { get; set; } + /// + /// + /// + public string Location { get; set; } + + } } diff --git a/New_College.Model/Models/SubjectSelection.cs b/New_College.Model/Models/SubjectSelection.cs new file mode 100644 index 0000000..f24f9d6 --- /dev/null +++ b/New_College.Model/Models/SubjectSelection.cs @@ -0,0 +1,36 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + + +namespace New_College.Model.Models +{ + /// + /// + /// + [SugarTable("SubjectSelection", "WMBLOG_MYSQL")] + public class SubjectSelection + { + public SubjectSelection() + { + } + [SugarColumn(IsPrimaryKey = true)] + public int Id { get; set; } + + + public string UniversityName { get; set; } + + public string MajorName { get; set; } + + public string Selection { get; set; } + + public string IncludeMajor { get; set; } + + public string Direction { get; set; } + + public string AcademicYear { get; set; } + + public string Province { get; set; } + } +} \ No newline at end of file diff --git a/New_College.Model/Request/NewsPageRequest.cs b/New_College.Model/Request/NewsPageRequest.cs new file mode 100644 index 0000000..1ba3292 --- /dev/null +++ b/New_College.Model/Request/NewsPageRequest.cs @@ -0,0 +1,12 @@ +using New_College.Model.ViewModels; +using System; +using System.Collections.Generic; +using System.Text; + +namespace New_College.Model.Request +{ + public class NewsPageRequest : BasePageRequest + { + public int CategoryId { get; set; } + } +} diff --git a/New_College.Model/Request/SelectionServiceRequest.cs b/New_College.Model/Request/SelectionServiceRequest.cs new file mode 100644 index 0000000..25aff42 --- /dev/null +++ b/New_College.Model/Request/SelectionServiceRequest.cs @@ -0,0 +1,15 @@ +using New_College.Model.ViewModels; +using System; +using System.Collections.Generic; +using System.Text; + +namespace New_College.Model.Request +{ + public class SelectionServiceRequest: BasePageRequest + { + public List UniversityName { get; set; } + + public List MajorName { get; set; } + + } +} diff --git a/New_College.Model/ViewModels/BaseResult.cs b/New_College.Model/ViewModels/BaseResult.cs index 18a58a1..60ebfc4 100644 --- a/New_College.Model/ViewModels/BaseResult.cs +++ b/New_College.Model/ViewModels/BaseResult.cs @@ -9,6 +9,10 @@ namespace New_College.Model.ViewModels public int Id { get; set; } public string Name { get; set; } + + public int Year { get; set; } + + public int Score { get; set; } = 999; } public class IdQuery diff --git a/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs b/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs index 211177f..74ef414 100644 --- a/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs +++ b/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs @@ -96,13 +96,15 @@ namespace New_College.Model.ViewModels /// /// 0(新高考)，1，文科，2 理科 /// - public int? Subject { get; set; } + public int? Subject { get; set; } = -1; /// /// 选科文字展示 /// public string Subjectgroup { get; set; } + public string subjectgroupName { get; set; } + /// /// 考生预计分数 /// diff --git a/New_College.Model/ViewModels/Query/EnrollmentPlanRequest.cs b/New_College.Model/ViewModels/Query/EnrollmentPlanRequest.cs new file mode 100644 index 0000000..3569516 --- /dev/null +++ b/New_College.Model/ViewModels/Query/EnrollmentPlanRequest.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace New_College.Model.ViewModels.Query +{ + public class EnrollmentPlanRequest + { + public string UniversityName { get; set; } + + public string MajorName { get; set; } + + public int AreaId { get; set; } + + public int Years { get; set; } + + public int PlanId { get; set; } + + } +} diff --git a/New_College.Model/ViewModels/Query/MajorQuery.cs b/New_College.Model/ViewModels/Query/MajorQuery.cs index 5bcab93..ce1fcf8 100644 --- a/New_College.Model/ViewModels/Query/MajorQuery.cs +++ b/New_College.Model/ViewModels/Query/MajorQuery.cs @@ -28,7 +28,7 @@ namespace New_College.Model.ViewModels /// /// 办学性质 /// - public int Nature { get; set; } + public int Nature { get; set; } = 1; /// /// 学校类型 @@ -38,17 +38,17 @@ namespace New_College.Model.ViewModels /// /// 是否985 0、否，1、是 /// - public int Nhef { get; set; } + public int Nhef { get; set; } = -1; /// /// 是否211 0、否，1、是 /// - public int Sff { get; set; } + public int Sff { get; set; } = -1; /// /// 是否双一流 0、否，1、是 /// - public int Syl { get; set; } + public int Syl { get; set; } = -1; } public class MajorCareerQuery diff --git a/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs b/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs index ac5b514..bd275be 100644 --- a/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs +++ b/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs @@ -19,7 +19,6 @@ namespace New_College.Model.ViewModels public int StudentId { get; set; } - public int CycleTimeId { get; set; } public string Tags { get; set; } } diff --git a/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs b/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs index e07dd36..df622a0 100644 --- a/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs +++ b/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs @@ -92,7 +92,7 @@ namespace New_College.Model.ViewModels /// /// 省份Id /// - public int AreaId { get; set; } + //public int AreaId { get; set; } /// /// 省份名称 diff --git a/New_College.Model/ViewModels/Query/TagEnrollmentPlaneQuery.cs b/New_College.Model/ViewModels/Query/TagEnrollmentPlaneQuery.cs index 5ffbf30..7c85c4e 100644 --- a/New_College.Model/ViewModels/Query/TagEnrollmentPlaneQuery.cs +++ b/New_College.Model/ViewModels/Query/TagEnrollmentPlaneQuery.cs @@ -136,16 +136,7 @@ namespace New_College.Model.ViewModels //public string UniversityAreaName { get; set; } public List UniversityAreaName { get; set; } - /// - /// 省市区名称 - /// - public string AreaName { get; set; } - - /// - /// 省份Id - /// - public int AreaId { get; set; } - + /// /// 办学性质1、公立，2、私立 /// @@ -160,7 +151,7 @@ namespace New_College.Model.ViewModels /// /// 专业Ids /// - public List MajorIds { get; set; } + public List TradeIds { get; set; } } /// diff --git a/New_College.Model/ViewModels/Result/EnrollmentPlansResult.cs b/New_College.Model/ViewModels/Result/EnrollmentPlansResult.cs new file mode 100644 index 0000000..5026527 --- /dev/null +++ b/New_College.Model/ViewModels/Result/EnrollmentPlansResult.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace New_College.Model.ViewModels.Result +{ + public class EnrollmentPlansResult + { + + /// + /// 招生计划详情Id + /// + public int Id { get; set; } + /// + /// 院校名称 + /// + public string UniversityName { get; set; } + + /// + /// 批次名称 + /// + public string BatchName { get; set; } + + /// + /// 专业名称 + /// + public string MajorName { get; set; } + + /// + /// 招生人数 + /// + public int PlanCount { get; set; } + + } +} diff --git a/New_College.Repository/BASE/ISubjectSelectionRepository.cs b/New_College.Repository/BASE/ISubjectSelectionRepository.cs new file mode 100644 index 0000000..598bc17 --- /dev/null +++ b/New_College.Repository/BASE/ISubjectSelectionRepository.cs @@ -0,0 +1,12 @@ +using New_College.IRepository.Base; +using New_College.Model.Models; + +namespace New_College.IRepository +{ + /// + /// ISubjectSelectionRepository + /// + public interface ISubjectSelectionRepository : IBaseRepository + { + } +} \ No newline at end of file diff --git a/New_College.Repository/BASE/IT_EnrollmentPlaneRepository.cs b/New_College.Repository/BASE/IT_EnrollmentPlaneRepository.cs index cfc90df..f8ac5e3 100644 --- a/New_College.Repository/BASE/IT_EnrollmentPlaneRepository.cs +++ b/New_College.Repository/BASE/IT_EnrollmentPlaneRepository.cs @@ -1,5 +1,9 @@ using New_College.IRepository.Base; using New_College.Model.Models; +using New_College.Model.ViewModels.Query; +using New_College.Model.ViewModels.Result; +using System.Collections.Generic; +using System.Threading.Tasks; namespace New_College.IRepository { @@ -8,5 +12,6 @@ namespace New_College.IRepository /// public interface IT_EnrollmentPlaneRepository : IBaseRepository { + Task> GetEnrollmentPlans(EnrollmentPlanRequest request); } } \ No newline at end of file diff --git a/New_College.Repository/BASE/SubjectSelectionRepository.cs b/New_College.Repository/BASE/SubjectSelectionRepository.cs new file mode 100644 index 0000000..0120773 --- /dev/null +++ b/New_College.Repository/BASE/SubjectSelectionRepository.cs @@ -0,0 +1,17 @@ +using New_College.IRepository; +using New_College.IRepository.UnitOfWork; +using New_College.Model.Models; +using New_College.Repository.Base; + +namespace New_College.Repository +{ + /// + /// SubjectSelectionRepository + /// + public class SubjectSelectionRepository : BaseRepository, ISubjectSelectionRepository + { + public SubjectSelectionRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + } +} \ No newline at end of file diff --git a/New_College.Repository/BASE/T_EnrollmentPlaneRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlaneRepository.cs index ef72622..e830dc1 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlaneRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlaneRepository.cs @@ -1,17 +1,46 @@ using New_College.IRepository; using New_College.IRepository.UnitOfWork; using New_College.Model.Models; +using New_College.Model.ViewModels.Query; +using New_College.Model.ViewModels.Result; using New_College.Repository.Base; +using SqlSugar; +using System.Collections.Generic; +using System.Threading.Tasks; namespace New_College.Repository { - /// - /// T_EnrollmentPlaneRepository - /// + /// + /// T_EnrollmentPlaneRepository + /// public class T_EnrollmentPlaneRepository : BaseRepository, IT_EnrollmentPlaneRepository { public T_EnrollmentPlaneRepository(IUnitOfWork unitOfWork) : base(unitOfWork) { } + + + /// + /// + /// + /// + /// + public async Task> GetEnrollmentPlans(EnrollmentPlanRequest request) + { + var planinfo = await this.Db.Queryable((plans, universitys, batchs) => new object[] { JoinType.Left, plans.UniversityId == universitys.Id, JoinType.Left, plans.BatchtypeId == batchs.Id }) + .Where((plans, universitys) => plans.PlanId == request.PlanId) + .WhereIF(!string.IsNullOrEmpty(request.UniversityName), (plans, universitys, batchs) => universitys.Name.Contains(request.UniversityName)) + .WhereIF(!string.IsNullOrEmpty(request.MajorName), (plans, universitys, batchs) => plans.MajorName.Contains(request.MajorName)) + .OrderBy((plans) => plans.OrderSort, OrderByType.Desc).Select((plans, universitys, batchs) => new EnrollmentPlansResult + { + Id = plans.Id, + BatchName = batchs.Batch_name, + MajorName = plans.MajorName, + PlanCount = plans.Plancount, + UniversityName = universitys.Name + }).ToListAsync(); + return planinfo; + ; + } } } \ No newline at end of file diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index c0ee058..4b2167c 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -99,7 +99,7 @@ namespace New_College.Services wheres = wheres.And(x => x.IsDelete == false); if (!string.IsNullOrEmpty(query.AreaName) && query.AreaName != "全国") wheres = wheres.And(x => x.Area_Name.Contains(query.AreaName)); - if (query.SubjectLevel < 2) + if (query.SubjectLevel > 0) wheres = wheres.And(x => x.Subject_Level == query.SubjectLevel); if (query.Type >= 0) wheres = wheres.And(x => x.Type == query.Type); @@ -271,7 +271,7 @@ namespace New_College.Services MasterCount = university.Master_Count, AcademicianCount = university.Academician_Count, // IsCollection = false, - //Description = ClearHtmlHelper.SHTML(university.Description), + Description = ClearHtmlHelper.SHTML(university.Description), LongSchoolId = (await _dal.Query(x => x.IsDelete == false && x.table == "D_University" && x.newid == university.Id)).Select(x => x.longid).FirstOrDefault() }; var mapuniversity = await d_MajorMapUniversityRepository.Query(x => x.Universityid == query.Id && x.IsDelete == false); @@ -358,7 +358,7 @@ namespace New_College.Services wheres = wheres.And(x => x.IsDelete == false && universityids.Contains(x.Id)); if (!string.IsNullOrEmpty(query.AreaName) && query.AreaName != "全国") wheres = wheres.And(x => x.Area_Name.Contains(query.AreaName)); - if (query.SubjectLevel < 2) + if (query.SubjectLevel > 0) wheres = wheres.And(x => x.Subject_Level == query.SubjectLevel); if (query.Type >= 0) wheres = wheres.And(x => x.Type == query.Type); @@ -395,6 +395,7 @@ namespace New_College.Services Syl = t.Syl == 1, Nhef = t.Nhef == 1, UniversityType = t.Type, + SubjectLevel = t.Subject_Level, Rank = t.Rank, }); } diff --git a/New_College.Services/SubjectSelectionServices.cs b/New_College.Services/SubjectSelectionServices.cs new file mode 100644 index 0000000..c047fe2 --- /dev/null +++ b/New_College.Services/SubjectSelectionServices.cs @@ -0,0 +1,18 @@ + +using New_College.IServices; +using New_College.Model.Models; +using New_College.Services.BASE; +using New_College.IRepository.Base; + +namespace New_College.Services +{ + public class SubjectSelectionServices : BaseServices, ISubjectSelectionServices + { + private readonly IBaseRepository _dal; + public SubjectSelectionServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + } +} \ No newline at end of file diff --git a/New_College.Services/T_EnrollmentPlaneServices.cs b/New_College.Services/T_EnrollmentPlaneServices.cs index 138eb67..460027f 100644 --- a/New_College.Services/T_EnrollmentPlaneServices.cs +++ b/New_College.Services/T_EnrollmentPlaneServices.cs @@ -11,29 +11,37 @@ using System.Data; using System.Linq; using System.Data.Entity.ModelConfiguration.Conventions; using System; +using New_College.Model.ViewModels.Result; +using New_College.Model.ViewModels.Query; namespace New_College.Services { public class T_EnrollmentPlaneServices : BaseServices, IT_EnrollmentPlaneServices { private readonly IBaseRepository _dal; - private readonly IT_EnrollmentPlanedescServices t_EnrollmentPlanedescServices; - private readonly IT_EnrollmentBatchRepository t_EnrollmentBatchRepository; - private readonly ID_UniversityRepository d_UniversityRepository; - private readonly ID_MajorRepository d_MajorRepository; - public T_EnrollmentPlaneServices(IBaseRepository dal - , IT_EnrollmentPlanedescServices IT_EnrollmentPlanedescServices - , IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository - , ID_UniversityRepository ID_UniversityRepository - , ID_MajorRepository ID_MajorRepository) + private readonly IT_EnrollmentPlaneRepository planeRepository; + + public T_EnrollmentPlaneServices(IBaseRepository dal, IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository) { this._dal = dal; - t_EnrollmentPlanedescServices = IT_EnrollmentPlanedescServices; - t_EnrollmentBatchRepository = IT_EnrollmentBatchRepository; - d_UniversityRepository = ID_UniversityRepository; - d_MajorRepository = ID_MajorRepository; base.BaseDal = dal; + this.planeRepository = t_EnrollmentPlaneRepository; + } + + /// + /// 招生计划 + /// + /// + /// + public async Task> GetEnrollmentPlans(EnrollmentPlanRequest request) + { + return await this.planeRepository.GetEnrollmentPlans(request); + } + + public Task Import() + { + throw new NotImplementedException(); } #region 2019上海招生分数更新 @@ -107,51 +115,53 @@ namespace New_College.Services /// 2019上海招生分数更新 /// /// - public async Task Import() - { - try - { - var dataSet = ExcelUtil.ReadExcelToDataSet("D:\\Ashuju\\数据\\好帮手\\招生计划\\导入步骤\\江苏省2019缺失分数线补充.xlsx"); - if (dataSet.Tables.Count > 0) - { - var info = await t_EnrollmentPlanedescServices.Query(x => x.PlanId == 9 && x.IsDelete == false && x.Scoreline <= 0); - var universitylist = await d_UniversityRepository.Query(x => x.IsDelete == false); - List list = new List() { }; - List adduniversity = new List() { }; - foreach (DataRow dr in dataSet.Tables[0].Rows) - { - string Name = dr["Name"].ToString(); - string MajorName = dr["MajorName"].ToString(); - string Scoreline = dr["Scoreline"].ToString(); - if (Scoreline != "0") - { - var universityid = universitylist.Where(x => x.Name == Name).Select(x => x.Id).FirstOrDefault(); - if (universityid > 0) - { - var nowinfo = info.Where(x => x.UniversityId == universityid && x.MajorName == MajorName).FirstOrDefault(); - if (nowinfo != null) - { + //public async Task Import() + //{ + // try + // { + // var dataSet = ExcelUtil.ReadExcelToDataSet("D:\\Ashuju\\数据\\好帮手\\招生计划\\导入步骤\\江苏省2019缺失分数线补充.xlsx"); + // if (dataSet.Tables.Count > 0) + // { + // var info = await t_EnrollmentPlanedescServices.Query(x => x.PlanId == 9 && x.IsDelete == false && x.Scoreline <= 0); + // var universitylist = await d_UniversityRepository.Query(x => x.IsDelete == false); + // List list = new List() { }; + // List adduniversity = new List() { }; + // foreach (DataRow dr in dataSet.Tables[0].Rows) + // { + // string Name = dr["Name"].ToString(); + // string MajorName = dr["MajorName"].ToString(); + // string Scoreline = dr["Scoreline"].ToString(); + // if (Scoreline != "0") + // { + // var universityid = universitylist.Where(x => x.Name == Name).Select(x => x.Id).FirstOrDefault(); + // if (universityid > 0) + // { + // var nowinfo = info.Where(x => x.UniversityId == universityid && x.MajorName == MajorName).FirstOrDefault(); + // if (nowinfo != null) + // { - nowinfo.Scoreline = Convert.ToSingle(Scoreline); - list.Add(nowinfo); - } - } - } + // nowinfo.Scoreline = Convert.ToSingle(Scoreline); + // list.Add(nowinfo); + // } + // } + // } - } + // } - var count = await t_EnrollmentPlanedescServices.Update(list); - var cc = 0; - } - return true; - } - catch (Exception ex) - { + // var count = await t_EnrollmentPlanedescServices.Update(list); + // var cc = 0; + // } + // return true; + //} + //catch (Exception ex) + //{ + + // throw; + //} + + //} - throw; - } - } } } \ No newline at end of file diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index 18a9b2a..052b03c 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -1076,43 +1076,7 @@ namespace New_College.Services return string.IsNullOrWhiteSpace(remake) ? name : remake.Contains("(") || remake.Contains("（") ? name + remake : name + "(" + remake + ")"; } - /// - /// 根据年份省份获取批次 - /// - /// - public async Task>> GetBatchByAreaAndYear(BatchQuery query) - { - var info = await t_EnrollmentBatchRepository.Query(x => x.IsDelete == false && x.AreaName == query.AreaName && x.Year == query.Year && !x.Batch_name.Contains("提前") && !x.Batch_name.Contains("零志愿")); - if (info.Count() <= 0) - return new MessageModel>() { success = false, msg = "数据为空" }; - List list = new List() { }; - foreach (var item in info) - { - if (item.Type != "不分文理") - { - list.Add(new IdNameResult() - { - Id = item.Id, - Name = item.Batch_name + "(" + item.Type + ")" - }); - } - else - { - list.Add(new IdNameResult() - { - Id = item.Id, - Name = item.Batch_name - }); - } - } - return new MessageModel>() - { - success = true, - msg = "获取成功", - response = list - }; - } /// /// 冲稳保获取推荐学校专业 @@ -1124,7 +1088,7 @@ namespace New_College.Services //所选科目 分数 if (query.Score <= 0) return new MessageModel>() { 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.Id == query.BatchId); if (planinfo == null) return new MessageModel>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." }; //筛选符合条件的院校ids @@ -1177,11 +1141,11 @@ namespace New_College.Services var wheres = PredicateBuilder.New(); wheres.And(x => universityids.Contains(x.UniversityId) && x.IsDelete == false && x.PlanId == planinfo.FirstOrDefault().Id && x.BatchtypeId == query.BatchId && x.UniversityId > 0); //().Id && batchids.Contains(x.BatchtypeId) && x.UniversityId > 0); - if (query.MajorIds != null && query.MajorIds.Count > 0) + if (query.TradeIds != null && query.TradeIds.Count > 0) { //所选专业增加majorids筛选 //query.MajorIds - var majorclassinfo = await d_MajorClassRepository.Query(x => query.MajorIds.Contains(x.TradeId) && x.IsDelete == false); + var majorclassinfo = await d_MajorClassRepository.Query(x => query.TradeIds.Contains(x.TradeId) && x.IsDelete == false); var CategoryClassids = majorclassinfo.Select(x => x.Id).ToList(); var major = await d_MajorRepository.Query(x => x.IsDelete == false && CategoryClassids.Contains(x.CategoryClass_Id)); if (major.Count() <= 0) @@ -2155,7 +2119,8 @@ namespace New_College.Services list.Add(new IdNameResult() { Id = item.Id, - Name = item.Batch_name + "(" + item.Type + ")" + Name = item.Batch_name + "(" + item.Type + ")", + Year = item.Year }); } else @@ -2163,7 +2128,8 @@ namespace New_College.Services list.Add(new IdNameResult() { Id = item.Id, - Name = item.Batch_name + Name = item.Batch_name, + Year = item.Year }); } } @@ -2174,5 +2140,10 @@ namespace New_College.Services response = list }; } + + public Task>> GetBatchByAreaAndYear(BatchQuery query) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/New_College.Services/Test_PsychMeasurementInfoServices.cs b/New_College.Services/Test_PsychMeasurementInfoServices.cs index d663274..5665a0f 100644 --- a/New_College.Services/Test_PsychMeasurementInfoServices.cs +++ b/New_College.Services/Test_PsychMeasurementInfoServices.cs @@ -126,7 +126,7 @@ namespace New_College.Services { StudentId = query.StudentId, CategoryId = query.CategoryId, - CycleTimeId = query.CycleTimeId, + CycleTimeId = 109, //ClassName = query.ClassName, //GradeName = query.GradeName, IsOpen = IsOpen, @@ -417,7 +417,7 @@ namespace New_College.Services { StudentId = query.StudentId, CategoryId = query.CategoryId, - CycleTimeId = query.CycleTimeId, + CycleTimeId = 87,//需要动态获取---CycleTimeId //ClassName = query.ClassName, //GradeName = query.GradeName, IsOpen = 1, @@ -436,7 +436,7 @@ namespace New_College.Services { StudentId = query.StudentId, CategoryId = query.CategoryId, - CycleTimeId = query.CycleTimeId, + CycleTimeId = 87, //ClassName = query.ClassName, //GradeName = query.GradeName, IsOpen = 1, @@ -784,7 +784,7 @@ namespace New_College.Services public async Task> SubjectChartRadar(ResultLookQuery query) { SubjectEvBillDTO dTO = new SubjectEvBillDTO() { }; - var info = (await _dal.Query(x => x.IsDelete == false && x.StudentId == query.StudentId && x.CategoryId == query.CategoryId && x.CycleTimeId == query.CycleTimeId)).FirstOrDefault(); + var info = (await _dal.Query(x => x.IsDelete == false && x.StudentId == query.StudentId && x.CategoryId == query.CategoryId)).FirstOrDefault(); if (info == null) return new MessageModel() { success = false, msg = "未测试" }; List newlist = new List() { }; @@ -803,42 +803,46 @@ namespace New_College.Services var chartsabilitvalue = new List(); var evbillabilit = new List(); var result = JsonConvert.DeserializeObject>(info.Result); - var xq = result.Where(w => w.name == "学科兴趣").FirstOrDefault().value; - foreach (var item in xq) + + var xqinfo = result.Where(w => w.name == "学科兴趣"); + if (xqinfo.Any()) { - switch (item.name) + var xq = xqinfo.FirstOrDefault().value; + foreach (var item in xq) { - case "物理": - chartsinterestvalue.Add(item.value); - newlist.Where(x => x.name == "物理").FirstOrDefault().value += item.value; - break; - case "化学": - chartsinterestvalue.Add(item.value); - newlist.Where(x => x.name == "化学").FirstOrDefault().value += item.value; - break; - case "生物": - chartsinterestvalue.Add(item.value); - newlist.Where(x => x.name == "生物").FirstOrDefault().value += item.value; - break; - case "政治": - chartsinterestvalue.Add(item.value); - newlist.Where(x => x.name == "政治").FirstOrDefault().value += item.value; - break; - case "历史": - chartsinterestvalue.Add(item.value); - newlist.Where(x => x.name == "历史").FirstOrDefault().value += item.value; - break; - case "地理": - chartsinterestvalue.Add(item.value); - newlist.Where(x => x.name == "地理").FirstOrDefault().value += item.value; - break; + switch (item.name) + { + case "物理": + chartsinterestvalue.Add(item.value); + newlist.Where(x => x.name == "物理").FirstOrDefault().value += item.value; + break; + case "化学": + chartsinterestvalue.Add(item.value); + newlist.Where(x => x.name == "化学").FirstOrDefault().value += item.value; + break; + case "生物": + chartsinterestvalue.Add(item.value); + newlist.Where(x => x.name == "生物").FirstOrDefault().value += item.value; + break; + case "政治": + chartsinterestvalue.Add(item.value); + newlist.Where(x => x.name == "政治").FirstOrDefault().value += item.value; + break; + case "历史": + chartsinterestvalue.Add(item.value); + newlist.Where(x => x.name == "历史").FirstOrDefault().value += item.value; + break; + case "地理": + chartsinterestvalue.Add(item.value); + newlist.Where(x => x.name == "地理").FirstOrDefault().value += item.value; + break; + } } + subjectinterest.BillDatas = chartsinterestvalue; + + var subjectinterestnewsort = xq.OrderByDescending(x => x.value); + subjectinterest.Name = string.Join("|", subjectinterestnewsort.Take(3).Select(x => x.name).ToList()); } - subjectinterest.BillDatas = chartsinterestvalue; - - var subjectinterestnewsort = xq.OrderByDescending(x => x.value); - subjectinterest.Name = string.Join("|", subjectinterestnewsort.Take(3).Select(x => x.name).ToList()); - evbillinterest.Add(new EvBillcator() { max = 32, text = "物理" }); evbillinterest.Add(new EvBillcator() { max = 32, text = "化学" }); evbillinterest.Add(new EvBillcator() { max = 32, text = "生物" }); @@ -846,41 +850,46 @@ namespace New_College.Services evbillinterest.Add(new EvBillcator() { max = 32, text = "历史" }); evbillinterest.Add(new EvBillcator() { max = 32, text = "地理" }); - var nl = result.Where(w => w.name == "学科能力").FirstOrDefault().value; - foreach (var item in nl) + var nlinfo = result.Where(w => w.name == "学科能力"); + if (nlinfo.Any()) { - switch (item.name) + var nl = nlinfo.FirstOrDefault().value; + foreach (var item in nl) { - case "物理": - chartsabilitvalue.Add(item.value); - newlist.Where(x => x.name == "物理").FirstOrDefault().value += item.value; - break; - case "化学": - chartsabilitvalue.Add(item.value); - newlist.Where(x => x.name == "化学").FirstOrDefault().value += item.value; - break; - case "生物": - chartsabilitvalue.Add(item.value); - newlist.Where(x => x.name == "生物").FirstOrDefault().value += item.value; - break; - case "政治": - chartsabilitvalue.Add(item.value); - newlist.Where(x => x.name == "政治").FirstOrDefault().value += item.value; - break; - case "历史": - chartsabilitvalue.Add(item.value); - newlist.Where(x => x.name == "历史").FirstOrDefault().value += item.value; - break; - case "地理": - chartsabilitvalue.Add(item.value); - newlist.Where(x => x.name == "地理").FirstOrDefault().value += item.value; - break; + switch (item.name) + { + case "物理": + chartsabilitvalue.Add(item.value); + newlist.Where(x => x.name == "物理").FirstOrDefault().value += item.value; + break; + case "化学": + chartsabilitvalue.Add(item.value); + newlist.Where(x => x.name == "化学").FirstOrDefault().value += item.value; + break; + case "生物": + chartsabilitvalue.Add(item.value); + newlist.Where(x => x.name == "生物").FirstOrDefault().value += item.value; + break; + case "政治": + chartsabilitvalue.Add(item.value); + newlist.Where(x => x.name == "政治").FirstOrDefault().value += item.value; + break; + case "历史": + chartsabilitvalue.Add(item.value); + newlist.Where(x => x.name == "历史").FirstOrDefault().value += item.value; + break; + case "地理": + chartsabilitvalue.Add(item.value); + newlist.Where(x => x.name == "地理").FirstOrDefault().value += item.value; + break; + } + subjectability.BillDatas = chartsabilitvalue; + + var subjectabilitynewsort = nl.OrderByDescending(x => x.value); + subjectability.Name = string.Join("|", subjectabilitynewsort.Take(3).Select(x => x.name).ToList()); + } } - subjectability.BillDatas = chartsabilitvalue; - - var subjectabilitynewsort = nl.OrderByDescending(x => x.value); - subjectability.Name = string.Join("|", subjectabilitynewsort.Take(3).Select(x => x.name).ToList()); evbillabilit.Add(new EvBillcator() { max = 32, text = "物理" }); evbillabilit.Add(new EvBillcator() { max = 32, text = "化学" }); diff --git a/New_College.Services/V_CustomerInfoServices.cs b/New_College.Services/V_CustomerInfoServices.cs index 7306099..4338606 100644 --- a/New_College.Services/V_CustomerInfoServices.cs +++ b/New_College.Services/V_CustomerInfoServices.cs @@ -128,14 +128,42 @@ namespace New_College.Services if (info == null) return new CustomerInfoResult() { Status = 3 }; info.Datainit = true; - info.AreaId = query.AreaId; - info.AreaName = query.AreaName; - info.Subject = query.Subject; - info.Subjectgroup = query.Subjectgroup; - info.Expectedscore = query.Expectedscore; - info.Year = query.Year; - info.SchoolName = query.SchoolName; - info.ClassName = query.ClassName; + if (query.AreaId > 0) + { + info.AreaId = query.AreaId; + } + if (!string.IsNullOrEmpty(query.AreaName)) + { + info.AreaName = query.AreaName; + } + if (query.Subject >= 0) + { + info.Subject = query.Subject; + } + if (!string.IsNullOrEmpty(query.Subjectgroup)) + { + info.Subjectgroup = query.Subjectgroup; + } + if (!string.IsNullOrEmpty(query.subjectgroupName)) + { + info.subjectgroupName = query.subjectgroupName; + } + if (query.Expectedscore > 0) + { + info.Expectedscore = query.Expectedscore; + } + if (query.Year > 0) + { + info.Year = query.Year; + } + if (!string.IsNullOrEmpty(query.SchoolName)) + { + info.SchoolName = query.SchoolName; + } + if (!string.IsNullOrEmpty(query.ClassName)) + { + info.ClassName = query.ClassName; + } var result = await _dal.Update(info); if (result) { @@ -198,6 +226,7 @@ namespace New_College.Services IsVIP = info.IsVIP, Subject = info.Subject, Subjectgroup = info.Subjectgroup, + subjectgroupName = info.subjectgroupName, VipCode = info.VipCode, IsUpdateScore = info.IsUpdateScore, Year = info.Year