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

更新部分接口---

develop
易大师 2021-02-06 19:00:47 +08:00
parent 2e729a12ce
commit 4df909ce32
30 changed files with 768 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
New_College.Api/Controllers/Front/EnrollMentPlansController.cs Normal file
View File

@ -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
{
/// <summary>
///招生计划
/// </summary>
[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;
}
/// <summary>
/// 根据院校和专业获取招生计划列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<EnrollmentPlansResult>>> 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<List<EnrollmentPlansResult>>()
{
msg = "success",
response = result,
success = true
};
}
else
{
return new MessageModel<List<EnrollmentPlansResult>>()
{
msg = "相关信息更新中...",
};
}
}
catch (Exception ex)
{
return new MessageModel<List<EnrollmentPlansResult>>()
{
msg = ex.Message
};
}
}
}
}

81
New_College.Api/Controllers/Front/FrontSelectionController.cs Normal file
View File

@ -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
{
/// <summary>
/// 新高考选科
/// </summary>
[Route("api/[controller]")]
[ApiController]
//[Authorize]
public class FrontSelectionController : ControllerBase
{
private readonly ISubjectSelectionServices _selectionServices;
public FrontSelectionController(ISubjectSelectionServices subjectSelection)
{
this._selectionServices = subjectSelection;
}
/// <summary>
/// 根据院校和专业名称查询选科组合情况
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<SubjectSelection>>> GetSubjectSelects([FromQuery] SelectionServiceRequest request)
{
try
{
var wheres = PredicateBuilder.New<SubjectSelection>();
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<PageModel<SubjectSelection>>()
{
msg = "success",
response = subjectlist,
success = true
};
}
catch (Exception ex)
{
return new MessageModel<PageModel<SubjectSelection>>()
{
msg = ex.Message
};
}
}
}
}

42
New_College.Api/Controllers/Front/NewsInfoController.cs
View File

@ -63,6 +63,48 @@ namespace New_College.Api.Controllers.Front
}
/// <summary>
/// 所有新闻列表带分页
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<NewsInfoResponse>>> GetPageNews([FromQuery] NewsPageRequest request)
{
var pageresponse = new PageModel<NewsInfoResponse>();
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<PageModel<NewsInfoResponse>>()
{
msg = "success",
response = pageresponse,
success = true
};
}
catch (Exception ex)
{
return new MessageModel<PageModel<NewsInfoResponse>>()
{
msg = "fail",
success = false
};
}
}
/// <summary>
/// 根据Id 获取新闻详情
/// </summary>

10
New_College.Api/Controllers/Front/VolunteerController.cs
View File

@ -85,11 +85,11 @@ namespace New_College.Api.Controllers.Front
/// 根据年份省份获取批次
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<IdNameResult>>> GetBatchByAreaAndYear([FromQuery] BatchQuery query)
{
return await t_EnrollmentPlanedescServices.GetBatchByAreaAndYear(query);
}
//[HttpGet]
//public async Task<MessageModel<List<IdNameResult>>> GetBatchByAreaAndYear([FromQuery] BatchQuery query)
//{
// return await t_EnrollmentPlanedescServices.GetBatchByAreaAndYear(query);
//}
/// <summary>
/// 冲稳保获取推荐学校专业

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

@ -200,6 +200,11 @@
虚假学校1,0为正规学校
</summary>
</member>
<member name="P:New_College.Model.Models.D_FackUniversity.Location">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.D_Major.CategoryClass_Id">
<summary>
专业二级分类id
@ -1256,6 +1261,11 @@
是否删除
</summary>
</member>
<member name="T:New_College.Model.Models.SubjectSelection">
<summary>
</summary>
</member>
<member name="T:New_College.Model.Models.SysRegion">
<summary>
省市区
@ -2879,6 +2889,56 @@
年份
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoQuery.Id">
<summary>
编号id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoQuery.Code">
<summary>
账号 key
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoQuery.CardTypeId">
<summary>
vip 卡类别id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.Id">
<summary>
编号id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.Code">
<summary>
账号 key
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.CardTypeId">
<summary>
卡片类别
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.IsBind">
<summary>
是否绑定
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardTypeQuery.Name">
<summary>
卡类型名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardTypeQuery.Money">
<summary>
金额
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardTypeQuery.Day">
<summary>
天数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.ExaminationPolicyQuery.AreaId">
<summary>
@ -3344,11 +3404,6 @@
年份
</summary>
</member>
<member name="P:New_College.Model.ViewModels.YearAreaQuery.AreaId">
<summary>
省份Id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.YearAreaQuery.AreaName">
<summary>
省份名称
@ -3469,16 +3524,6 @@
学校省份
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.AreaName">
<summary>
省市区名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.AreaId">
<summary>
省份Id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.Nature">
<summary>
办学性质1、公立，2、私立
@ -3489,7 +3534,7 @@
高校级别 985传1 211传2 双一流传3 其他传0或者不传
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.MajorIds">
<member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.TradeIds">
<summary>
专业Ids
</summary>
@ -3574,56 +3619,6 @@
院校类型 （0，校友会 1,武书连 2,软科 3,QS 4,U.S.News）
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoQuery.Id">
<summary>
编号id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoQuery.Code">
<summary>
账号 key
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoQuery.CardTypeId">
<summary>
vip 卡类别id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.Id">
<summary>
编号id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.Code">
<summary>
账号 key
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.CardTypeId">
<summary>
卡片类别
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardInfoSearchQuery.IsBind">
<summary>
是否绑定
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardTypeQuery.Name">
<summary>
卡类型名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardTypeQuery.Money">
<summary>
金额
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Query.VipCardTypeQuery.Day">
<summary>
天数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.AutoVipInfoQuery.VipCardTypeId">
<summary>
vip卡类型id
@ -4119,6 +4114,31 @@
文章内容
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Result.EnrollmentPlansResult.Id">
<summary>
招生计划详情Id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Result.EnrollmentPlansResult.UniversityName">
<summary>
院校名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Result.EnrollmentPlansResult.BatchName">
<summary>
批次名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Result.EnrollmentPlansResult.MajorName">
<summary>
专业名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.Result.EnrollmentPlansResult.PlanCount">
<summary>
招生人数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.ExaminationPolicyResult.AreaName">
<summary>
省份名称

37
New_College.Api/New_College.xml
View File

@ -150,6 +150,18 @@
<param name="query"></param>
<returns></returns>
</member>
<member name="T:New_College.Api.Controllers.Front.EnrollMentPlansController">
<summary>
招生计划
</summary>
</member>
<member name="M:New_College.Api.Controllers.Front.EnrollMentPlansController.GetEnrollmentPlans(New_College.Model.ViewModels.Query.EnrollmentPlanRequest)">
<summary>
根据院校和专业获取招生计划列表
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.ExaminationPolicyController.GetExaminationPolicyDetail(New_College.Model.ViewModels.ExaminationPolicyAreaQuery)">
<summary>
获取考试时间
@ -175,6 +187,18 @@
</summary>
<returns></returns>
</member>
<member name="T:New_College.Api.Controllers.Front.FrontSelectionController">
<summary>
新高考选科
</summary>
</member>
<member name="M:New_College.Api.Controllers.Front.FrontSelectionController.GetSubjectSelects(New_College.Model.Request.SelectionServiceRequest)">
<summary>
根据院校和专业名称查询选科组合情况
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.GetUniversitys(New_College.Model.ViewModels.UniversityQuery)">
<summary>
获取院校库
@ -318,6 +342,13 @@
<param name="request"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.NewsInfoController.GetPageNews(New_College.Model.Request.NewsPageRequest)">
<summary>
所有新闻列表带分页
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.NewsInfoController.GetDetail(New_College.Model.Request.NewsDetailRequest)">
<summary>
根据Id 获取新闻详情
@ -560,12 +591,6 @@
<param name="query"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.VolunteerController.GetBatchByAreaAndYear(New_College.Model.ViewModels.BatchQuery)">
<summary>
根据年份省份获取批次
</summary>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.VolunteerController.GetEnrollmentCWBByPage(New_College.Model.ViewModels.CWBEnrollmentPlaneQuery)">
<summary>
冲稳保获取推荐学校专业

16
New_College.IServices/ISubjectSelectionServices.cs Normal file
View File

@ -0,0 +1,16 @@
using New_College.IServices.BASE;
using New_College.Model.Models;
namespace New_College.IServices
{
/// <summary>
/// ISubjectSelectionServices
/// </summary>
public interface ISubjectSelectionServices :IBaseServices<SubjectSelection>
{
}
}

29
New_College.IServices/IT_EnrollmentPlaneServices.cs
View File

@ -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
{
/// <summary>
/// IT_EnrollmentPlaneServices
/// </summary>
public interface IT_EnrollmentPlaneServices :IBaseServices<T_EnrollmentPlane>
{
Task<bool> Import();
}
{
/// <summary>
/// IT_EnrollmentPlaneServices
/// </summary>
public interface IT_EnrollmentPlaneServices : IBaseServices<T_EnrollmentPlane>
{
Task<bool> Import();
/// <summary>
/// 根据大学或者专业获取招生计划
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<List<EnrollmentPlansResult>> GetEnrollmentPlans(EnrollmentPlanRequest request);
}
}

6
New_College.Model/Models/D_FackUniversity.cs
View File

@ -25,5 +25,11 @@ namespace New_College.Model.Models
public int Type { get; set; }
/// <summary>
///
/// </summary>
public string Location { get; set; }
}
}

36
New_College.Model/Models/SubjectSelection.cs Normal file
View File

@ -0,0 +1,36 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
namespace New_College.Model.Models
{
///<summary>
///
///</summary>
[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; }
}
}

12
New_College.Model/Request/NewsPageRequest.cs Normal file
View File

@ -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; }
}
}

15
New_College.Model/Request/SelectionServiceRequest.cs Normal file
View File

@ -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<string> UniversityName { get; set; }
public List<string> MajorName { get; set; }
}
}

4
New_College.Model/ViewModels/BaseResult.cs
View File

@ -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

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

@ -96,13 +96,15 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 0(新高考)，1，文科，2 理科
/// </summary>
public int? Subject { get; set; }
public int? Subject { get; set; } = -1;
/// <summary>
/// 选科文字展示
/// </summary>
public string Subjectgroup { get; set; }
public string subjectgroupName { get; set; }
/// <summary>
/// 考生预计分数
/// </summary>

20
New_College.Model/ViewModels/Query/EnrollmentPlanRequest.cs Normal file
View File

@ -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; }
}
}

8
New_College.Model/ViewModels/Query/MajorQuery.cs
View File

@ -28,7 +28,7 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 办学性质
/// </summary>
public int Nature { get; set; }
public int Nature { get; set; } = 1;
/// <summary>
/// 学校类型
@ -38,17 +38,17 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 是否985 0、否，1、是
/// </summary>
public int Nhef { get; set; }
public int Nhef { get; set; } = -1;
/// <summary>
/// 是否211 0、否，1、是
/// </summary>
public int Sff { get; set; }
public int Sff { get; set; } = -1;
/// <summary>
/// 是否双一流 0、否，1、是
/// </summary>
public int Syl { get; set; }
public int Syl { get; set; } = -1;
}
public class MajorCareerQuery

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

@ -19,7 +19,6 @@ namespace New_College.Model.ViewModels
public int StudentId { get; set; }
public int CycleTimeId { get; set; }
public string Tags { get; set; }
}

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

@ -92,7 +92,7 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 省份Id
/// </summary>
public int AreaId { get; set; }
//public int AreaId { get; set; }
/// <summary>
/// 省份名称

13
New_College.Model/ViewModels/Query/TagEnrollmentPlaneQuery.cs
View File

@ -136,16 +136,7 @@ namespace New_College.Model.ViewModels
//public string UniversityAreaName { get; set; }
public List<string> UniversityAreaName { get; set; }
/// <summary>
/// 省市区名称
/// </summary>
public string AreaName { get; set; }
/// <summary>
/// 省份Id
/// </summary>
public int AreaId { get; set; }
/// <summary>
/// 办学性质1、公立，2、私立
/// </summary>
@ -160,7 +151,7 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 专业Ids
/// </summary>
public List<int> MajorIds { get; set; }
public List<int> TradeIds { get; set; }
}
/// <summary>

35
New_College.Model/ViewModels/Result/EnrollmentPlansResult.cs Normal file
View File

@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace New_College.Model.ViewModels.Result
{
public class EnrollmentPlansResult
{
/// <summary>
/// 招生计划详情Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 院校名称
/// </summary>
public string UniversityName { get; set; }
/// <summary>
/// 批次名称
/// </summary>
public string BatchName { get; set; }
/// <summary>
/// 专业名称
/// </summary>
public string MajorName { get; set; }
/// <summary>
/// 招生人数
/// </summary>
public int PlanCount { get; set; }
}
}

12
New_College.Repository/BASE/ISubjectSelectionRepository.cs Normal file
View File

@ -0,0 +1,12 @@
using New_College.IRepository.Base;
using New_College.Model.Models;
namespace New_College.IRepository
{
/// <summary>
/// ISubjectSelectionRepository
/// </summary>
public interface ISubjectSelectionRepository : IBaseRepository<SubjectSelection>
{
}
}

5
New_College.Repository/BASE/IT_EnrollmentPlaneRepository.cs
View File

@ -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
/// </summary>
public interface IT_EnrollmentPlaneRepository : IBaseRepository<T_EnrollmentPlane>
{
Task<List<EnrollmentPlansResult>> GetEnrollmentPlans(EnrollmentPlanRequest request);
}
}

17
New_College.Repository/BASE/SubjectSelectionRepository.cs Normal file
View File

@ -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
{
/// <summary>
/// SubjectSelectionRepository
/// </summary>
public class SubjectSelectionRepository : BaseRepository<SubjectSelection>, ISubjectSelectionRepository
{
public SubjectSelectionRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}
}

35
New_College.Repository/BASE/T_EnrollmentPlaneRepository.cs
View File

@ -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
{
/// <summary>
/// T_EnrollmentPlaneRepository
/// </summary>
/// <summary>
/// T_EnrollmentPlaneRepository
/// </summary>
public class T_EnrollmentPlaneRepository : BaseRepository<T_EnrollmentPlane>, IT_EnrollmentPlaneRepository
{
public T_EnrollmentPlaneRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
/// <summary>
///
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<List<EnrollmentPlansResult>> GetEnrollmentPlans(EnrollmentPlanRequest request)
{
var planinfo = await this.Db.Queryable<T_EnrollmentPlanedesc, D_University, T_EnrollmentBatch>((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;
;
}
}
}

7
New_College.Services/D_LongIdMapServices.cs
View File

@ -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,
});
}

18
New_College.Services/SubjectSelectionServices.cs Normal file
View File

@ -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<SubjectSelection>, ISubjectSelectionServices
{
private readonly IBaseRepository<SubjectSelection> _dal;
public SubjectSelectionServices(IBaseRepository<SubjectSelection> dal)
{
this._dal = dal;
base.BaseDal = dal;
}
}
}

116
New_College.Services/T_EnrollmentPlaneServices.cs
View File

@ -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<T_EnrollmentPlane>, IT_EnrollmentPlaneServices
{
private readonly IBaseRepository<T_EnrollmentPlane> _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<T_EnrollmentPlane> 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<T_EnrollmentPlane> 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;
}
/// <summary>
/// 招生计划
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<List<EnrollmentPlansResult>> GetEnrollmentPlans(EnrollmentPlanRequest request)
{
return await this.planeRepository.GetEnrollmentPlans(request);
}
public Task<bool> Import()
{
throw new NotImplementedException();
}
#region 2019上海招生分数更新
@ -107,51 +115,53 @@ namespace New_College.Services
/// 2019上海招生分数更新
/// </summary>
/// <returns></returns>
public async Task<bool> 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<T_EnrollmentPlanedesc> list = new List<T_EnrollmentPlanedesc>() { };
List<string> adduniversity = new List<string>() { };
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<bool> 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<T_EnrollmentPlanedesc> list = new List<T_EnrollmentPlanedesc>() { };
// List<string> adduniversity = new List<string>() { };
// 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;
}
}
}
}

53
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -1076,43 +1076,7 @@ namespace New_College.Services
return string.IsNullOrWhiteSpace(remake) ? name : remake.Contains("(") || remake.Contains("（") ? name + remake : name + "(" + remake + ")";
}
/// <summary>
/// 根据年份省份获取批次
/// </summary>
/// <returns></returns>
public async Task<MessageModel<List<IdNameResult>>> 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<List<IdNameResult>>() { success = false, msg = "数据为空" };
List<IdNameResult> list = new List<IdNameResult>() { };
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<List<IdNameResult>>()
{
success = true,
msg = "获取成功",
response = list
};
}
/// <summary>
/// 冲稳保获取推荐学校专业
@ -1124,7 +1088,7 @@ namespace New_College.Services
//所选科目 分数
if (query.Score <= 0)
return new MessageModel<List<CWBEnrollmentPlanResult>>() { 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<List<CWBEnrollmentPlanResult>>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." };
//筛选符合条件的院校ids
@ -1177,11 +1141,11 @@ namespace New_College.Services
var wheres = PredicateBuilder.New<T_EnrollmentPlanedesc>();
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<MessageModel<List<IdNameResult>>> GetBatchByAreaAndYear(BatchQuery query)
{
throw new NotImplementedException();
}
}
}

143
New_College.Services/Test_PsychMeasurementInfoServices.cs
View File

@ -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<MessageModel<SubjectEvBillDTO>> 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<SubjectEvBillDTO>() { success = false, msg = "未测试" };
List<IntellectJson> newlist = new List<IntellectJson>() { };
@ -803,42 +803,46 @@ namespace New_College.Services
var chartsabilitvalue = new List<decimal>();
var evbillabilit = new List<EvBillcator>();
var result = JsonConvert.DeserializeObject<List<SubjectSelectJson>>(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 = "化学" });

45
New_College.Services/V_CustomerInfoServices.cs
View File

@ -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