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

feat:bug --新增扩缩招人数接口

develop
old易 2023-11-24 20:46:03 +08:00
parent 5b72847995
commit d0c76bda11
13 changed files with 1099 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
New_College.Api/Controllers/Back/D_PlanMajorDescController.cs
View File

@ -8,6 +8,7 @@ using System.Linq.Expressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using New_College.Model.ViewModels; using New_College.Model.ViewModels;
using System.Linq; using System.Linq;
using Org.BouncyCastle.Asn1.Ocsp;
namespace New_College.Api.Controllers namespace New_College.Api.Controllers
{ {
@ -20,13 +21,91 @@ namespace New_College.Api.Controllers
/// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下 /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
/// </summary> /// </summary>
private readonly ID_PlanMajorDescServices _d_PlanMajorDescServices; private readonly ID_PlanMajorDescServices _d_PlanMajorDescServices;
private readonly ID_PlanMajorDescProServices _d_PlanMajorDescProServices;
public D_PlanMajorDescController(ID_PlanMajorDescServices D_PlanMajorDescServices) public D_PlanMajorDescController(ID_PlanMajorDescServices D_PlanMajorDescServices, ID_PlanMajorDescProServices d_PlanMajorDescProServices)
{ {
_d_PlanMajorDescServices = D_PlanMajorDescServices; _d_PlanMajorDescServices = D_PlanMajorDescServices;
_d_PlanMajorDescProServices = d_PlanMajorDescProServices;
} }
/// <summary>
/// 查询扩缩招院校招生计划详情
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<MajorPlanProView>> GetMajorPlanPro([FromQuery] MajorPlanProViewQuery request)
{
if (request.Year <= 0)
{
return new MessageModel<MajorPlanProView>()
{
msg = "Year字段必传参数",
};
}
if (string.IsNullOrEmpty(request.Location))
{
return new MessageModel<MajorPlanProView>()
{
msg = "Location字段必传参数",
};
}
if (request.UId <= 0)
{
return new MessageModel<MajorPlanProView>()
{
msg = "UId字段必传参数",
};
}
var query = await _d_PlanMajorDescProServices.GetMajorPlanPro(request);
return new MessageModel<MajorPlanProView>()
{
response = query,
success = query != null ? true : false,
msg = query != null ? "获取成功" : "获取失败"
};
}
/// <summary>
/// 查询扩缩招院校列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<UniversityPlanProView>>> GetUniversityPlanPro([FromQuery] UniversityProViewQuery request)
{
var result = new PageModel<UniversityPlanProView>();
if (string.IsNullOrWhiteSpace(request.Location))
{
return new MessageModel<PageModel<UniversityPlanProView>>()
{
msg = "Location字段必传参数",
};
}
if (request.Year <= 0)
{
return new MessageModel<PageModel<UniversityPlanProView>>()
{
msg = "Year字段必传参数",
};
}
var pagemodel = await _d_PlanMajorDescProServices.GetUniversityPlanPro(request);
return new MessageModel<PageModel<UniversityPlanProView>>()
{
response = pagemodel,
success = pagemodel.data.Any() ? true : false,
msg = pagemodel.data.Any() ? "获取成功" : "获取失败"
};
}
/// <summary> /// <summary>
/// 一键填报 /// 一键填报
/// </summary> /// </summary>
@ -57,7 +136,7 @@ namespace New_College.Api.Controllers
{ {
return new MessageModel<PageModel<OneSubmitGoResponse>>() return new MessageModel<PageModel<OneSubmitGoResponse>>()
{ {
msg= "SubjectClaim字段必传参数", msg = "SubjectClaim字段必传参数",
}; };
} }
@ -72,7 +151,7 @@ namespace New_College.Api.Controllers
} }
var response = await _d_PlanMajorDescServices.GetPlanMajorList(request); var response = await _d_PlanMajorDescServices.GetPlanMajorList(request);
if (response.data==null||!response.data.Any() || response.dataCount <= 0) if (response.data == null || !response.data.Any() || response.dataCount <= 0)
{ {
return new MessageModel<PageModel<OneSubmitGoResponse>>() return new MessageModel<PageModel<OneSubmitGoResponse>>()
{ {

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

@ -127,34 +127,47 @@ namespace New_College.Api.Controllers.Front
view.BatchName = query.BatchName; view.BatchName = query.BatchName;
view.CreateTime = query.CreateTime; view.CreateTime = query.CreateTime;
view.ModifyTime = query.ModifyTime; view.ModifyTime = query.ModifyTime;
view.tableDetailItemsViews = items.Select(c => new VolunteerTableDetailItemsView() var tableDetailItemsViews = new List<VolunteerTableDetailItemsView>();
{
UniversityId = c.UniversityId,
UniversityName = c.UniversityName,
UniversityCode = c.UniversityCode,
_211 = planmajordesc.Where(e => e.UId == c.UniversityId).FirstOrDefault()._211,
_985 = planmajordesc.Where(e => e.UId == c.UniversityId).FirstOrDefault()._985,
_SYL = planmajordesc.Where(e => e.UId == c.UniversityId).FirstOrDefault()._SYL,
planMajorItems = planmajordesc.Where(ww => ww.UId == c.UniversityId).Select(s => new VolunteerTablePlanMajorItem()
{
fee = s.Free,
Major = s.Major,
MajorCode = s.MajorCode,
MajorGroup = s.MajorGroup,
MajorRemark = s.Remark,
planCount = s.PlanCount,
PlanId = s.Id,
SubjectClam = s.SelectSubject,
PlanItems = planmajorcomplist.Where(pp => pp.Major == s.Major && pp.UId == c.UniversityId).Select(p => new PlanItem()
{
PlanCount = p.PlanCount,
RankLine = p.LowScoreRank,
Scoreline = p.LowScore,
Year = p.Years.ToString(),
}).ToList()
}).ToList()
}).ToList();
items.ForEach(s =>
{
var planids = s.PlanMajorIds.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(ss => int.Parse(ss)).ToList();
var uitem = new VolunteerTableDetailItemsView()
{
// Sort = s.Sort,
planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.Id)).Select(c => new VolunteerTablePlanMajorItem()
{
fee = c.Free,
Major = c.Major,
MajorCode = c.MajorCode,
MajorGroup = c.MajorGroup,
MajorRemark = c.Remark,
planCount = c.PlanCount,
PlanId = c.Id,
Sort = s.OrderSort,
SubjectClam = c.SelectSubject,
PlanItems = planmajorcomplist.Where(ee => ee.UId == s.UniversityId && ee.Major == c.Major).Select(tt => new PlanItem()
{
Count = tt.PlanCount,
PlanCount = tt.PlanCount,
RankLine = tt.LowScoreRank,
Scoreline = tt.LowScore,
Year = tt.Years.ToString()
}).ToList()
}).ToList(),
UniversityId = s.UniversityId,
UniversityName = s.UniversityName,
UniversityCode = s.UniversityCode,
Sort= s.OrderSort,
_211 = planmajordesc.Where(e => e.UId == s.UniversityId).FirstOrDefault()._211,
_985 = planmajordesc.Where(e => e.UId == s.UniversityId).FirstOrDefault()._985,
_SYL = planmajordesc.Where(e => e.UId == s.UniversityId).FirstOrDefault()._SYL,
};
tableDetailItemsViews.Add(uitem);
});
view.tableDetailItemsViews=tableDetailItemsViews;
return new MessageModel<VolunteerTableDetailDtoView>() return new MessageModel<VolunteerTableDetailDtoView>()
{ {
msg = "获取成功", msg = "获取成功",
@ -175,6 +188,14 @@ namespace New_College.Api.Controllers.Front
[HttpPost("Post")] [HttpPost("Post")]
public async Task<MessageModel<string>> Post([FromBody] VolunteerTableDtoView request) public async Task<MessageModel<string>> Post([FromBody] VolunteerTableDtoView request)
{ {
if (request.CustomerId <= 0)
{
return new MessageModel<string>()
{
msg = "用户Id"
};
}
var data = new MessageModel<string>(); var data = new MessageModel<string>();
int ordersort = 0; int ordersort = 0;
if (string.IsNullOrWhiteSpace(request.VolunteerTableName)) if (string.IsNullOrWhiteSpace(request.VolunteerTableName))
@ -214,7 +235,7 @@ namespace New_College.Api.Controllers.Front
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
IsDelete = false, IsDelete = false,
ModifyTime = DateTime.Now, ModifyTime = DateTime.Now,
OrderSort = 0, OrderSort = c.Sort,
PlanMajorIds = c.PlanMajorIds, PlanMajorIds = c.PlanMajorIds,
UniversityCode = c.UniversityCode, UniversityCode = c.UniversityCode,
UniversityId = c.UniversityId, UniversityId = c.UniversityId,
@ -254,7 +275,17 @@ namespace New_College.Api.Controllers.Front
if (request.VId > 0) if (request.VId > 0)
{ {
_unitOfWork.BeginTran(); _unitOfWork.BeginTran();
data.success = await _VolunteerTableServices.Update(request); data.success = await _VolunteerTableServices.Update(new U_VolunteerTable()
{
BatchName = request.BatchName,
ModifyTime = DateTime.Now,
CustomerId = request.CustomerId,
Id = request.VId,
Score = request.Score,
SubjectClaim = request.SubjectClaim,
Type = request.Type,
VolunteerTableName = request.VolunteerTableName
});
//删掉之前的志愿表，更新新的匹配进来 //删掉之前的志愿表，更新新的匹配进来
var itemids = (await _VolunteerTableDetailServices.Query(c => c.VolunteerTableId == request.VId)).Select(c => (object)c.Id).ToArray(); var itemids = (await _VolunteerTableDetailServices.Query(c => c.VolunteerTableId == request.VId)).Select(c => (object)c.Id).ToArray();
var status = await _VolunteerTableDetailServices.DeleteByIds(itemids); var status = await _VolunteerTableDetailServices.DeleteByIds(itemids);
@ -263,7 +294,7 @@ namespace New_College.Api.Controllers.Front
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
IsDelete = false, IsDelete = false,
ModifyTime = DateTime.Now, ModifyTime = DateTime.Now,
OrderSort = 0, OrderSort = c.Sort,
PlanMajorIds = c.PlanMajorIds, PlanMajorIds = c.PlanMajorIds,
UniversityCode = c.UniversityCode, UniversityCode = c.UniversityCode,
UniversityId = c.UniversityId, UniversityId = c.UniversityId,

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

@ -665,6 +665,146 @@
学校曾用名 学校曾用名
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.UId">
<summary>
院校Id
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Years">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.UniversityName">
<summary>
院校名称
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.UniversityRemark">
<summary>
院校备注
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.AreaName">
<summary>
院校所在省份
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.CityName">
<summary>
院校所在城市
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Rank">
<summary>
排名
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro._SYL">
<summary>
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.SubjectType">
<summary>
科类
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.MajorGroup">
<summary>
专业组
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.BatchName">
<summary>
批次
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.SelectSubject">
<summary>
选科要求
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.RootType">
<summary>
门类
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.FirstType">
<summary>
一级学科
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Major">
<summary>
专业
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Remark">
<summary>
专业备注
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.LowScore">
<summary>
最低分
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.LowScoreRank">
<summary>
最低分排名
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.AcademicYear">
<summary>
学制
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Free">
<summary>
学费
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Location">
<summary>
生源地
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Nature">
<summary>
办学性质:公办 民办
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.Ownership">
<summary>
学校归属
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.EnrollmentCode">
<summary>
全国统一招生代码
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.EnrollmentType">
<summary>
招生类型
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.SchoolType">
<summary>
学校类别
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.EducationCategory">
<summary>
学历类别
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorDescPro.FormerName">
<summary>
学校曾用名
</summary>
</member>
<member name="T:New_College.Model.Models.D_PlanMajorScoreLine"> <member name="T:New_College.Model.Models.D_PlanMajorScoreLine">
<summary> <summary>
各省份每年招生计划专业分数线 各省份每年招生计划专业分数线
@ -6535,6 +6675,186 @@
</summary> </summary>
</member> </member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.SubjectLevel">
<summary>
学科层次(1本科，0专科)
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.AreaName">
<summary>
省市区名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.Nature">
<summary>
办学性质
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.CustomerId">
<summary>
用户id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.Type">
<summary>
学校类型
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.Nhef">
<summary>
是否985 0、否，1、是
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.Sff">
<summary>
是否211 0、否，1、是
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.Syl">
<summary>
是否双一流 0、否，1、是
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityProViewQuery.Location">
<summary>
学生所在省份
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.Years">
<summary>
年份
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.planCount">
<summary>
计划数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.NewCount">
<summary>
扩缩招生情况
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.OldPlanCount">
<summary>
上一年招生人数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.fee">
<summary>
学费
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.MajorCode">
<summary>
专业代码
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.MajorGroup">
<summary>
专业组
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.Major">
<summary>
专业名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.MajorRemark">
<summary>
专业备注
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.SubjectClam">
<summary>
选科组合
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MajorPlanProItemView.BatchName">
<summary>
批次名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.Web">
<summary>
官网
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.UId">
<summary>
院校id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.Name">
<summary>
名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.Rank">
<summary>
排名
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView._985">
<summary>
是否985
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView._211">
<summary>
是否211
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView._SYL">
<summary>
是否双一流
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.Logo">
<summary>
学校logo
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.AreaName">
<summary>
省市区名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.Nature">
<summary>
办学性质
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.AscriptionName">
<summary>
隶属于
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.SubjectLevel">
<summary>
学科层次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.UniversityType">
<summary>
学校类型
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.MajorCount">
<summary>
招生专业数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.ALLCount">
<summary>
招生总人数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPlanProView.NewCount">
<summary>
扩缩招生情况
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableDetailDtoView.CustomerId"> <member name="P:New_College.Model.ViewModels.VolunteerTableDetailDtoView.CustomerId">
<summary> <summary>
用户ID 用户ID

14
New_College.Api/New_College.xml
View File

@ -113,6 +113,20 @@
服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
</summary> </summary>
</member> </member>
<member name="M:New_College.Api.Controllers.D_PlanMajorDescController.GetMajorPlanPro(New_College.Model.ViewModels.MajorPlanProViewQuery)">
<summary>
查询扩缩招院校招生计划详情
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.D_PlanMajorDescController.GetUniversityPlanPro(New_College.Model.ViewModels.UniversityProViewQuery)">
<summary>
查询扩缩招院校列表
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.D_PlanMajorDescController.OneSubmitGo(New_College.Model.ViewModels.OneSubmitGoRequest)"> <member name="M:New_College.Api.Controllers.D_PlanMajorDescController.OneSubmitGo(New_College.Model.ViewModels.OneSubmitGoRequest)">
<summary> <summary>
一键填报 一键填报

32
New_College.IServices/ID_PlanMajorDescProServices.cs Normal file
View File

@ -0,0 +1,32 @@
using Microsoft.AspNetCore.Mvc;
using New_College.IServices.BASE;
using New_College.Model;
using New_College.Model.Models;
using New_College.Model.ViewModels;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace New_College.IServices
{
/// <summary>
/// ID_PlanMajorDescProServices
/// </summary>
public interface ID_PlanMajorDescProServices :IBaseServices<D_PlanMajorDescPro>
{
/// <summary>
/// 扩缩招院校
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<PageModel<UniversityPlanProView>> GetUniversityPlanPro(UniversityProViewQuery request);
/// <summary>
/// 扩缩招专业
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<MajorPlanProView> GetMajorPlanPro(MajorPlanProViewQuery request);
}
}

178
New_College.Model/Models/D_PlanMajorDescPro.cs Normal file
View File

@ -0,0 +1,178 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Text;
namespace New_College.Model.Models
{
//年份 学校 批次 选科要求 门类 一级学科 专业 专业代码 招生人数 学制 学费 生源地
public class D_PlanMajorDescPro : EntityModel
{
/// <summary>
/// 院校Id
/// </summary>
public int UId { get; set; }
/// <summary>
///
/// </summary>
public int Years { get; set; }
/// <summary>
/// 院校名称
/// </summary>
public string UniversityName { get; set; }
/// <summary>
/// 院校备注
/// </summary>
public string UniversityRemark { get; set; }
/// <summary>
/// 院校所在省份
/// </summary>
public string AreaName { get; set; }
/// <summary>
///院校所在城市
/// </summary>
public string CityName { get; set; }
/// <summary>
/// 排名
/// </summary>
public string Rank { get; set; }
public string _985 { get; set; }
public string _211 { get; set; }
/// <summary>
///
/// </summary>
public string _SYL { get; set; }
/// <summary>
/// 科类
/// </summary>
public string SubjectType { get; set; }
/// <summary>
/// 专业组
/// </summary>
public string MajorGroup { get; set; }
/// <summary>
///批次
/// </summary>
public string BatchName { get; set; }
/// <summary>
/// 选科要求
/// </summary>
public string SelectSubject { get; set; }
/// <summary>
/// 门类
/// </summary>
public string RootType { get; set; }
/// <summary>
/// 一级学科
/// </summary>
public string FirstType { get; set; }
/// <summary>
/// 专业
/// </summary>
[SugarColumn(IsNullable = true, Length = 1000)]
public string Major { get; set; }
/// <summary>
/// 专业备注
/// </summary>
public string Remark { get; set; }
public string MajorCode { get; set; }
public int PlanCount { get; set; }
public int NewCount { get; set; }
/// <summary>
/// 最低分
/// </summary>
public int LowScore { get; set; }
/// <summary>
/// 最低分排名
/// </summary>
public int LowScoreRank { get; set; }
/// <summary>
/// 学制
/// </summary>
public string AcademicYear { get; set; }
/// <summary>
/// 学费
/// </summary>
public string Free { get; set; }
/// <summary>
/// 生源地
/// </summary>
public string Location { get; set; }
/// <summary>
/// 办学性质:公办 民办
/// </summary>
public string Nature { get; set; }
/// <summary>
/// 学校归属
/// </summary>
public string Ownership { get; set; }
/// <summary>
/// 全国统一招生代码
/// </summary>
public string EnrollmentCode { get; set; }
/// <summary>
/// 招生类型
/// </summary>
public string EnrollmentType { get; set; }
/// <summary>
/// 学校类别
/// </summary>
public string SchoolType { get; set; }
/// <summary>
/// 学历类别
/// </summary>
public string EducationCategory { get; set; }
/// <summary>
/// 学校曾用名
/// </summary>
public string FormerName { get; set; }
}
}

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

@ -15,7 +15,7 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public class OneSubmitGoRequest : BasePageRequest public class OneSubmitGoRequest : BasePageRequest
{ {
public string Name { get; set; }
/// <summary> /// <summary>
/// 起始分数 /// 起始分数
/// </summary> /// </summary>

220
New_College.Model/ViewModels/UniversityPlanProView.cs Normal file
View File

@ -0,0 +1,220 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace New_College.Model.ViewModels
{
public class MajorPlanProViewQuery
{
public int UId { get; set; }
public string Location { get; set; }
public int Year { get; set; }
}
public class UniversityProViewQuery : BasePageRequest
{
public int Year { get; set; }
public string Name { get; set; }
/// <summary>
/// 学科层次(1本科，0专科)
/// </summary>
public int? SubjectLevel { get; set; }
/// <summary>
/// 省市区名称
/// </summary>
public List<string>? AreaName { get; set; }
/// <summary>
/// 办学性质
/// </summary>
public List<int>? Nature { get; set; }
/// <summary>
/// 用户id
/// </summary>
public int CustomerId { get; set; }
/// <summary>
/// 学校类型
/// </summary>
public List<int>? Type { get; set; }
/// <summary>
/// 是否985 0、否，1、是
/// </summary>
public int? Nhef { get; set; }
/// <summary>
/// 是否211 0、否，1、是
/// </summary>
public int? Sff { get; set; }
/// <summary>
/// 是否双一流 0、否，1、是
/// </summary>
public int? Syl { get; set; }
/// <summary>
/// 学生所在省份
/// </summary>
public string Location { get; set; }
}
public class MajorPlanProView
{
public int UId { get; set; }
public string UniversityName { get; set; }
public string UniversityCode { get; set; }
public List<MajorPlanProItemView> itemViews { get; set; }
}
public class MajorPlanProItemView
{
/// <summary>
/// 年份
/// </summary>
public int Years { get; set; }
/// <summary>
/// 计划数
/// </summary>
public int planCount { get; set; }
/// <summary>
/// 扩缩招生情况
/// </summary>
public int NewCount { get; set; }
/// <summary>
/// 上一年招生人数
/// </summary>
public int OldPlanCount { get; set; }
/// <summary>
/// 学费
/// </summary>
public string fee { get; set; }
/// <summary>
/// 专业代码
/// </summary>
public string MajorCode { get; set; }
/// <summary>
/// 专业组
/// </summary>
public string MajorGroup { get; set; }
/// <summary>
/// 专业名称
/// </summary>
public string Major { get; set; }
/// <summary>
/// 专业备注
/// </summary>
public string MajorRemark { get; set; }
/// <summary>
/// 选科组合
/// </summary>
public string SubjectClam { get; set; }
/// <summary>
/// 批次名称
/// </summary>
public string BatchName { get; set; }
}
public class UniversityPlanProView
{
public int PlanCount { get; set; }
/// <summary>
/// 官网
/// </summary>
public string Web { get; set; }
/// <summary>
/// 院校id
/// </summary>
public int UId { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 排名
/// </summary>
public string Rank { get; set; }
/// <summary>
/// 是否985
/// </summary>
public string _985 { get; set; }
/// <summary>
/// 是否211
/// </summary>
public string _211 { get; set; }
/// <summary>
/// 是否双一流
/// </summary>
public string _SYL { get; set; }
/// <summary>
/// 学校logo
/// </summary>
public string Logo { get; set; }
/// <summary>
/// 省市区名称
/// </summary>
public string AreaName { get; set; }
/// <summary>
/// 办学性质
/// </summary>
public string Nature { get; set; }
/// <summary>
/// 隶属于
/// </summary>
public string AscriptionName { get; set; }
/// <summary>
/// 学科层次
/// </summary>
public string SubjectLevel { get; set; }
/// <summary>
/// 学校类型
/// </summary>
public string UniversityType { get; set; }
/// <summary>
/// 招生专业数
/// </summary>
public int MajorCount { get; set; }
/// <summary>
/// 招生总人数
/// </summary>
public int ALLCount { get; set; }
/// <summary>
/// 扩缩招生情况
/// </summary>
public int NewCount { get; set; }
}
}

5
New_College.Model/ViewModels/VolunteerTableDtoView.cs
View File

@ -85,6 +85,8 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public string _SYL { get; set; } public string _SYL { get; set; }
public int Sort { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -99,6 +101,7 @@ namespace New_College.Model.ViewModels
/// </summary> /// </summary>
public int planCount { get; set; } public int planCount { get; set; }
public int Sort { get; set; }
/// <summary> /// <summary>
/// 学费 /// 学费
/// </summary> /// </summary>
@ -206,6 +209,8 @@ namespace New_College.Model.ViewModels
public class VolunteerTableDetailView public class VolunteerTableDetailView
{ {
public int Sort { get; set; }
/// <summary> /// <summary>
/// 院校Id /// 院校Id
/// </summary> /// </summary>

80
New_College.Repository/BASE/D_PlanMajorDescProRepository.cs Normal file
View File

@ -0,0 +1,80 @@
using New_College.IRepository;
using New_College.IRepository.UnitOfWork;
using New_College.Model;
using New_College.Model.Models;
using New_College.Model.ViewModels;
using New_College.Repository.Base;
using SqlSugar;
using System.Linq.Expressions;
using System.Linq;
using System;
using System.Threading.Tasks;
using MathNet.Numerics.Statistics.Mcmc;
using System.Collections.Generic;
namespace New_College.Repository
{
/// <summary>
/// D_PlanMajorDescProRepository
/// </summary>
public class D_PlanMajorDescProRepository : BaseRepository<D_PlanMajorDescPro>, ID_PlanMajorDescProRepository
{
public D_PlanMajorDescProRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
public async Task<PageModel<UniversityPlanProView>> GetUniversityPlanPro(UniversityProViewQuery request)
{
RefAsync<int> totalCount = 0;
var pageresult = new PageModel<UniversityPlanProView>();
var pagelist = await this.Db.Queryable<D_PlanMajorDescPro>().Where(c => c.Location == request.Location)
.Where(c => c.Years == request.Year)
.WhereIF(request.Sff.HasValue, c => c._211 == (request.Sff == 1 ? "是" : "否"))
.WhereIF(request.Nhef.HasValue, c => c._985 == (request.Nhef == 1 ? "是" : "否"))
.WhereIF(request.Syl.HasValue, c => c._SYL == (request.Syl == 1 ? "是" : "否"))
.WhereIF(request.Nature != null && request.Nature.Any(), x => SqlFunc.ContainsArray(request.Nature, x.Nature))
.WhereIF(request.AreaName != null && request.AreaName.Any() && !request.AreaName.Contains("全国"), x => SqlFunc.ContainsArray(request.AreaName, x.AreaName))
.WhereIF(request.SubjectLevel.HasValue, c => c.EducationCategory == (request.SubjectLevel == 1 ? "本科" : "专科"))
.WhereIF(!string.IsNullOrWhiteSpace(request.Name), c => SqlFunc.Contains(c.UniversityName, request.Name)).GroupBy(c => new
{
c.AreaName,
c.UId,
c.UniversityName,
c.Nature,
c._985,
c._211,
c._SYL,
c.SchoolType,
c.EducationCategory,
c.Rank
})
.Select(c => new UniversityPlanProView()
{
AreaName = c.AreaName,
ALLCount = SqlFunc.AggregateSum(c.PlanCount),
MajorCount = SqlFunc.AggregateCount(c.UId),
NewCount = SqlFunc.AggregateSum(c.NewCount),
UId = c.UId,
Name = c.UniversityName,
Nature = c.Nature,
_985 = c._985,
_211 = c._211,
_SYL = c._SYL,
UniversityType = c.SchoolType,
SubjectLevel = c.EducationCategory,
Rank = c.Rank
})
.OrderBy(k => k.UId, OrderByType.Asc)
.ToPageListAsync(request.PageIndex, request.PageSize, totalCount);
pageresult.pageCount = (Math.Ceiling(totalCount.ObjToDecimal() / request.PageSize.ObjToDecimal())).ObjToInt();
pageresult.page = request.PageIndex;
pageresult.data = pagelist;
pageresult.dataCount = totalCount;
pageresult.PageSize = request.PageSize;
return pageresult;
}
}
}

16
New_College.Repository/BASE/ID_PlanMajorDescProRepository.cs Normal file
View File

@ -0,0 +1,16 @@
using New_College.IRepository.Base;
using New_College.Model;
using New_College.Model.Models;
using New_College.Model.ViewModels;
using System.Threading.Tasks;
namespace New_College.IRepository
{
/// <summary>
/// ID_PlanMajorDescProRepository
/// </summary>
public interface ID_PlanMajorDescProRepository : IBaseRepository<D_PlanMajorDescPro>
{
Task<PageModel<UniversityPlanProView>> GetUniversityPlanPro(UniversityProViewQuery request);
}
}

83
New_College.Services/D_PlanMajorDescProServices.cs Normal file
View File

@ -0,0 +1,83 @@

using New_College.IServices;
using New_College.Model.Models;
using New_College.Services.BASE;
using New_College.IRepository.Base;
using System.Threading.Tasks;
using New_College.Model;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using New_College.Model.ViewModels;
using SqlSugar;
using System.Linq.Expressions;
using System;
using System.Data.Entity.Core.Common.CommandTrees;
using System.Linq;
using New_College.IRepository;
namespace New_College.Services
{
public class D_PlanMajorDescProServices : BaseServices<D_PlanMajorDescPro>, ID_PlanMajorDescProServices
{
private readonly IBaseRepository<D_PlanMajorDescPro> _dal;
private readonly ID_PlanMajorDescProRepository d_PlanMajorDescProRepository;
public D_PlanMajorDescProServices(IBaseRepository<D_PlanMajorDescPro> dal, ID_PlanMajorDescProRepository d_PlanMajorDescPro)
{
this._dal = dal;
base.BaseDal = dal;
d_PlanMajorDescProRepository= d_PlanMajorDescPro;
}
/// <summary>
///
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<MajorPlanProView> GetMajorPlanPro(MajorPlanProViewQuery request)
{
var majorview = new MajorPlanProView();
Expression<Func<D_PlanMajorDescPro, bool>> expression = Expressionable.Create<D_PlanMajorDescPro>()
.And(c => c.UId == request.UId)
.And(c => c.Location == request.Location)
.And(c => c.Years == request.Year)
.ToExpression();
var query = await _dal.Query(expression);
var view = query.First();
majorview.UId = view.UId;
majorview.UniversityName = view.Location;
majorview.UniversityCode = view.EnrollmentCode;
majorview.itemViews = query.Select(c => new MajorPlanProItemView()
{
BatchName = c.BatchName,
fee = c.Free,
Major = c.Major,
MajorCode = c.MajorCode,
MajorGroup = c.MajorGroup,
MajorRemark = c.Remark,
planCount = c.PlanCount,
NewCount = c.NewCount,
OldPlanCount = c.PlanCount + c.NewCount,
SubjectClam = c.SelectSubject,
Years = c.Years
}).ToList();
return majorview;
}
/// <summary>
///
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<PageModel<UniversityPlanProView>> GetUniversityPlanPro(UniversityProViewQuery request)
{
return await d_PlanMajorDescProRepository.GetUniversityPlanPro(request);
}
}
}

9
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -50,6 +50,7 @@ namespace New_College.Services
.And(c => c.IsDelete == false) .And(c => c.IsDelete == false)
.And(c => c.Location == request.Location) .And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName)) .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName))
.AndIF(!string.IsNullOrWhiteSpace(request.Name), c => SqlFunc.Contains(c.UniversityName, request.Name))
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SubjectType == request.SchoolType) .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SubjectType == request.SchoolType)
.AndIF(request.Score > 0 && (request.EndScore <= endscore && request.StartScore >= startscore), c => SqlFunc.Between(c.LowScore, startscore, endscore)) .AndIF(request.Score > 0 && (request.EndScore <= endscore && request.StartScore >= startscore), c => SqlFunc.Between(c.LowScore, startscore, endscore))
@ -68,7 +69,7 @@ namespace New_College.Services
.And(c => c.IsDelete == false) .And(c => c.IsDelete == false)
.And(c => c.Location == request.Location) .And(c => c.Location == request.Location)
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major)) .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major))
// .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, request.SubjectClaim)) //此条件不带 // .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, request.SubjectClaim)) //此条件不带
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, claim[0]) || SqlFunc.Contains(c.SelectSubject, claim[1]) || SqlFunc.Contains(c.SelectSubject, claim[2])) .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, claim[0]) || SqlFunc.Contains(c.SelectSubject, claim[1]) || SqlFunc.Contains(c.SelectSubject, claim[2]))
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName) .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName)) .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
@ -151,6 +152,10 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request) public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request)
{ {
request.PageSize = 96;//山东省
var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
var pagemodel = new PageModel<OneSubmitGoResponse>(); var pagemodel = new PageModel<OneSubmitGoResponse>();
Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>() Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>()
@ -170,8 +175,6 @@ namespace New_College.Services
.AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature)
//.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间 //.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间
.ToExpression(); .ToExpression();
var query = await _dal.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); var query = await _dal.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc ");
var majorarry = query.data.Select(c => c.Major).Distinct().ToArray(); var majorarry = query.data.Select(c => c.Major).Distinct().ToArray();