diff --git a/New_College.Api/Controllers/Back/D_PlanMajorScoreLineController.cs b/New_College.Api/Controllers/Back/D_PlanMajorScoreLineController.cs
deleted file mode 100644
index 94074ae..0000000
--- a/New_College.Api/Controllers/Back/D_PlanMajorScoreLineController.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using New_College.IServices;
-using New_College.Model;
-using New_College.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace New_College.Api.Controllers
-{
- [Route("api/[controller]/[action]")]
- [ApiController]
- [Authorize(Permissions.Name)]
- public class D_PlanMajorScoreLineController : ControllerBase
- {
- ///
- /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
- ///
- private readonly ID_PlanMajorScoreLineServices _d_PlanMajorScoreLineServices;
-
- public D_PlanMajorScoreLineController(ID_PlanMajorScoreLineServices D_PlanMajorScoreLineServices)
- {
- _d_PlanMajorScoreLineServices = D_PlanMajorScoreLineServices;
- }
-
- [HttpGet]
- public async Task>> Get(int page = 1, string key = "", int intPageSize = 50)
- {
- if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
- {
- key = "";
- }
-
- Expression> whereExpression = a => a.Id > 0;
-
- return new MessageModel>()
- {
- msg = "获取成功",
- success = true,
- response = await _d_PlanMajorScoreLineServices.QueryPage(whereExpression, page, intPageSize)
- };
-
- }
-
- [HttpGet("{id}")]
- public async Task> Get(int id = 0)
- {
- return new MessageModel()
- {
- msg = "获取成功",
- success = true,
- response = await _d_PlanMajorScoreLineServices.QueryById(id)
- };
- }
-
- [HttpPost]
- public async Task> Post([FromBody] D_PlanMajorScoreLine request)
- {
- var data = new MessageModel();
-
- var id = await _d_PlanMajorScoreLineServices.Add(request);
- data.success = id > 0;
-
- if (data.success)
- {
- data.response = id.ObjToString();
- data.msg = "添加成功";
- }
-
- return data;
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/New_College.Api/Controllers/Back/D_QualificationLineController.cs b/New_College.Api/Controllers/Back/D_QualificationLineController.cs
deleted file mode 100644
index 350f6cc..0000000
--- a/New_College.Api/Controllers/Back/D_QualificationLineController.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using New_College.IServices;
-using New_College.Model;
-using New_College.Model.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace New_College.Api.Controllers
-{
- [Route("api/[controller]/[action]")]
- [ApiController]
- [Authorize(Permissions.Name)]
- public class D_QualificationLineController : ControllerBase
- {
- ///
- /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
- ///
- private readonly ID_QualificationLineServices _d_QualificationLineServices;
-
- public D_QualificationLineController(ID_QualificationLineServices D_QualificationLineServices)
- {
- _d_QualificationLineServices = D_QualificationLineServices;
- }
-
- [HttpGet]
- public async Task>> Get(int page = 1, string key = "", int intPageSize = 50)
- {
- if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
- {
- key = "";
- }
-
- Expression> whereExpression = a => a.Id > 0;
-
- return new MessageModel>()
- {
- msg = "获取成功",
- success = true,
- response = await _d_QualificationLineServices.QueryPage(whereExpression, page, intPageSize)
- };
-
- }
-
- [HttpGet("{id}")]
- public async Task> Get(int id = 0)
- {
- return new MessageModel()
- {
- msg = "获取成功",
- success = true,
- response = await _d_QualificationLineServices.QueryById(id)
- };
- }
-
- [HttpPost]
- public async Task> Post([FromBody] D_QualificationLine request)
- {
- var data = new MessageModel();
-
- var id = await _d_QualificationLineServices.Add(request);
- data.success = id > 0;
-
- if (data.success)
- {
- data.response = id.ObjToString();
- data.msg = "添加成功";
- }
-
- return data;
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs b/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs
new file mode 100644
index 0000000..e8caff2
--- /dev/null
+++ b/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs
@@ -0,0 +1,88 @@
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using New_College.Model.ViewModels;
+using New_College.Services;
+using System.Linq;
+using SqlSugar;
+
+namespace New_College.Api.Controllers
+{
+
+ ///
+ /// 专业分数线
+ ///
+ [Route("api/[controller]/[action]")]
+ [ApiController]
+ [Authorize]
+ public class PlanMajorScoreLineController : ControllerBase
+ {
+ ///
+ /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+ ///
+ private readonly ID_PlanMajorScoreLineServices _d_PlanMajorScoreLineServices;
+
+ public PlanMajorScoreLineController(ID_PlanMajorScoreLineServices D_PlanMajorScoreLineServices)
+ {
+ _d_PlanMajorScoreLineServices = D_PlanMajorScoreLineServices;
+ }
+
+
+ ///
+ /// 获取学校专业分数线
+ ///
+ ///
+ ///
+ [HttpGet]
+ public async Task>> Get([FromQuery] PlanMajorScoreLineRequest request)
+ {
+ if (request.Uid <= 0)
+ {
+ return new MessageModel>()
+ {
+ success = false,
+ msg = "uid必传"
+ };
+ }
+ Expression> expression = Expressionable.Create()
+ .And(c => c.UId == request.Uid)
+ .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
+ .AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
+ .ToExpression();
+ var response = (await _d_PlanMajorScoreLineServices.Query(expression))
+ .Select(c => new PlanMajorScoreLineResponse()
+ {
+ BatchName = c.BatchName,
+ UId = request.Uid,
+ LowScore = c.LowScore,
+ LowScoreRank = c.LowScoreRank,
+ AvgScore = c.AvgScore,
+ Years = c.Years,
+ FirstType = c.FirstType,
+ HighScore = c.HighScore,
+ Major = c.Major,
+ MajorGroup = c.MajorGroup,
+ Remark = c.Remark,
+ SelectSubject = c.SelectSubject,
+
+ }).ToList();
+ return new MessageModel>()
+ {
+ msg = "获取成功",
+ success = true,
+ response = response
+ };
+
+ }
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/New_College.Api/Controllers/Back/QualificationLineController.cs b/New_College.Api/Controllers/Back/QualificationLineController.cs
new file mode 100644
index 0000000..1ee6eda
--- /dev/null
+++ b/New_College.Api/Controllers/Back/QualificationLineController.cs
@@ -0,0 +1,82 @@
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+
+namespace New_College.Api.Controllers
+{
+
+
+ ///
+ /// 院校投档线
+ ///
+ [Route("api/[controller]/[action]")]
+ [ApiController]
+ [Authorize]
+ public class QualificationLineController : ControllerBase
+ {
+ ///
+ /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+ ///
+ private readonly ID_QualificationLineServices _d_QualificationLineServices;
+
+ public QualificationLineController(ID_QualificationLineServices D_QualificationLineServices)
+ {
+ _d_QualificationLineServices = D_QualificationLineServices;
+ }
+
+
+
+ ///
+ /// 获取院校各年份省控线
+ ///
+ ///
+ ///
+ [HttpGet]
+ public async Task>> Get([FromQuery] QualificationLineRequest request)
+ {
+ if (request.Uid <= 0)
+ {
+ return new MessageModel>()
+ {
+ success = false,
+ msg = "uid必传"
+
+ };
+ }
+
+ Expression> expression = Expressionable.Create()
+ .And(c => c.UId == request.Uid)
+ .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
+ .AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
+ .ToExpression();
+ var response = (await _d_QualificationLineServices.Query(expression))
+ .Select(c => new QualificationLineResponse()
+ {
+ BatchName = c.BatchName,
+ UId = request.Uid,
+ LowScore = c.LowScore,
+ LowScoreRank = c.LowScoreRank,
+ ProvinceScore = c.ProvinceScore,
+ RecruitType = c.RecruitType,
+ Years = c.Years,
+ }).ToList();
+ return new MessageModel>()
+ {
+ msg = "获取成功",
+ success = true,
+ response = response
+ };
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/New_College.Api/Controllers/Front/LibraryController.cs b/New_College.Api/Controllers/Front/LibraryController.cs
index 4ffbaf8..6794914 100644
--- a/New_College.Api/Controllers/Front/LibraryController.cs
+++ b/New_College.Api/Controllers/Front/LibraryController.cs
@@ -112,7 +112,7 @@ namespace New_College.Api.Controllers.Front
///
///
[HttpPost]
- public async Task>> GetUniversitys([FromQuery] UniversityQuery query)
+ public async Task>> GetUniversitys([FromBody] UniversityQuery query)
{
var result = await iD_LongIdMapServices.GetUniversitys(query);
if (result.data == null || result.data.Count <= 0)
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index f2f5a2f..50c9bd7 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -726,6 +726,16 @@
最低分
+
+
+ 招生计划人数
+
+
+
+
+ 专业组
+
+
最低分排名
@@ -736,11 +746,6 @@
生源地
-
-
- 专业组
-
-
各个省份投档资格线
@@ -3290,6 +3295,56 @@
+
+
+ 院校Id
+
+
+
+
+ 年份
+
+
+
+
+ 批次
+
+
+
+
+ 选科要求
+
+
+
+
+ 一级学科
+
+
+
+
+ 平均分
+
+
+
+
+ 最高分
+
+
+
+
+ 最低分
+
+
+
+
+ 最低分排名
+
+
+
+
+ 专业组
+
+
测评类型
@@ -5505,6 +5560,11 @@
硕士数
+
+
+ 官网
+
+
主键id
@@ -6265,6 +6325,41 @@
+
+
+ 院校Id
+
+
+
+
+ 年份
+
+
+
+
+ 批次
+
+
+
+
+ 最低分
+
+
+
+
+ 最低分排名
+
+
+
+
+ 省控线
+
+
+
+
+ 招生类型
+
+
diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml
index 3c43d2d..e3c3c51 100644
--- a/New_College.Api/New_College.xml
+++ b/New_College.Api/New_College.xml
@@ -127,21 +127,45 @@
-
-
- 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
-
-
-
-
- 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
-
-
服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+
+
+ 专业分数线
+
+
+
+
+ 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+
+
+
+
+ 获取学校专业分数线
+
+
+
+
+
+
+ 院校投档线
+
+
+
+
+ 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+
+
+
+
+ 获取院校各年份省控线
+
+
+
+
服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
diff --git a/New_College.Model/Models/D_PlanMajorScoreLine.cs b/New_College.Model/Models/D_PlanMajorScoreLine.cs
index 5d7419a..78ccb9f 100644
--- a/New_College.Model/Models/D_PlanMajorScoreLine.cs
+++ b/New_College.Model/Models/D_PlanMajorScoreLine.cs
@@ -78,6 +78,16 @@ namespace New_College.Model.Models
///
public int LowScore { get; set; }
+ ///
+ /// 招生计划人数
+ ///
+ public int PlanCount { get; set; }
+
+ ///
+ /// 专业组
+ ///
+ public string MajorGroup { get; set; }
+
///
/// 最低分排名
///
@@ -88,10 +98,6 @@ namespace New_College.Model.Models
///
public string Location { get; set; }
- ///
- /// 专业组
- ///
- public string MajorGroup { get; set; }
}
diff --git a/New_College.Model/ViewModels/PlanMajorScoreLineViewModel.cs b/New_College.Model/ViewModels/PlanMajorScoreLineViewModel.cs
new file mode 100644
index 0000000..b432b55
--- /dev/null
+++ b/New_College.Model/ViewModels/PlanMajorScoreLineViewModel.cs
@@ -0,0 +1,88 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model.ViewModels
+{
+ public class PlanMajorScoreLineRequest
+ {
+ public int Uid { get; set; }
+
+ public int? Year { get; set; }
+
+ public string BatchName { get; set; }
+
+ }
+
+
+ public class PlanMajorScoreLineResponse
+ {
+
+ ///
+ /// 院校Id
+ ///
+ public int UId { get; set; }
+
+
+ ///
+ /// 年份
+ ///
+ public int Years { get; set; }
+
+
+
+ ///
+ /// 批次
+ ///
+ public string BatchName { get; set; }
+
+ ///
+ /// 选科要求
+ ///
+ public string SelectSubject { get; set; }
+
+
+ ///
+ /// 一级学科
+ ///
+
+ public string FirstType { get; set; }
+
+
+ public string Major { get; set; }
+
+
+ public string Remark { get; set; }
+
+ ///
+ /// 平均分
+ ///
+ public string AvgScore { get; set; }
+
+ ///
+ /// 最高分
+ ///
+ public string HighScore { get; set; }
+
+ ///
+ /// 最低分
+ ///
+ public int LowScore { get; set; }
+
+ ///
+ /// 最低分排名
+ ///
+ public int LowScoreRank { get; set; }
+
+
+
+ ///
+ /// 专业组
+ ///
+ public string MajorGroup { get; set; }
+
+
+
+ }
+}
diff --git a/New_College.Model/ViewModels/QualificationLineViewModel.cs b/New_College.Model/ViewModels/QualificationLineViewModel.cs
new file mode 100644
index 0000000..463ad7a
--- /dev/null
+++ b/New_College.Model/ViewModels/QualificationLineViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model
+{
+ public class QualificationLineRequest
+ {
+ public int Uid { get; set; }
+
+
+ public int? Year { get; set; }
+
+ public string BatchName { get; set; }
+
+ }
+
+ public class QualificationLineResponse
+ {
+
+ ///
+ /// 院校Id
+ ///
+ public int UId { get; set; }
+
+ ///
+ /// 年份
+ ///
+ public int Years { get; set; }
+ ///
+ /// 批次
+ ///
+ public string BatchName { get; set; }
+ ///
+ /// 最低分
+ ///
+ public int LowScore { get; set; }
+
+ ///
+ /// 最低分排名
+ ///
+ public int LowScoreRank { get; set; }
+ ///
+ /// 省控线
+ ///
+ public int ProvinceScore { get; set; }
+ ///
+ /// 招生类型
+ ///
+ public string RecruitType { get; set; }
+
+ }
+
+
+}
diff --git a/New_College.Model/ViewModels/Result/UniversityResult.cs b/New_College.Model/ViewModels/Result/UniversityResult.cs
index d47c275..2bf4523 100644
--- a/New_College.Model/ViewModels/Result/UniversityResult.cs
+++ b/New_College.Model/ViewModels/Result/UniversityResult.cs
@@ -6,6 +6,10 @@ namespace New_College.Model.ViewModels
{
public class UniversityResult
{
+ ///
+ /// 官网
+ ///
+ public string Web { get; set; }
///
/// 主键id
///
diff --git a/New_College.Model/ViewModels/Result/VolunteerResult.cs b/New_College.Model/ViewModels/Result/VolunteerResult.cs
index 2562dcf..96aeb45 100644
--- a/New_College.Model/ViewModels/Result/VolunteerResult.cs
+++ b/New_College.Model/ViewModels/Result/VolunteerResult.cs
@@ -137,7 +137,7 @@ namespace New_College.Model.ViewModels
///// 批次Id
/////
//public string BatchtypeId { get; set; }
-
+ public string Web { get; set; }
public string AscriptionName { get; set; }
}
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 9e9b7f2..6ff80f2 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -324,6 +324,7 @@ namespace New_College.Services
DoctorateCount = university.Doctorate_Count,
MasterCount = university.Master_Count,
AcademicianCount = university.Academician_Count,
+ Web=university.Web,
// IsCollection = false,
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()
diff --git a/New_College.sln b/New_College.sln
index 7b3e931..2b7ebde 100644
--- a/New_College.sln
+++ b/New_College.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "New_College.ConsoleApp", "N
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "New_College.AdminMvc", "New_College.AdminMvc\New_College.AdminMvc.csproj", "{06D885F3-6352-4BF6-B826-DEA742DFFBD7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "New_Spider", "New_Spider\New_Spider.csproj", "{E23857BF-DFBB-49DD-A86A-1B2932F6D33B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "New_Spider", "New_Spider\New_Spider.csproj", "{E23857BF-DFBB-49DD-A86A-1B2932F6D33B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution