diff --git a/New_College.Api/Controllers/Front/HighSchoolRankController.cs b/New_College.Api/Controllers/Front/HighSchoolRankController.cs
index a41afff..677871b 100644
--- a/New_College.Api/Controllers/Front/HighSchoolRankController.cs
+++ b/New_College.Api/Controllers/Front/HighSchoolRankController.cs
@@ -15,7 +15,7 @@ namespace New_College.Api.Controllers
{
[Route("api/[controller]/[action]")]
[ApiController]
- [Authorize(Permissions.Name)]
+ [Authorize]
public class HighSchoolRankController : ControllerBase
{
///
@@ -36,7 +36,7 @@ namespace New_College.Api.Controllers
/// 通过省份名称当作过滤条件模糊查询学校名称
///
[HttpGet]
- public async Task>> Get(HighSchoolRankRequest highSchoolRank)
+ public async Task>> Get([FromQuery] HighSchoolRankRequest highSchoolRank)
{
if (string.IsNullOrWhiteSpace(highSchoolRank.City))
{
@@ -58,7 +58,7 @@ namespace New_College.Api.Controllers
.And(c => c.IsDelete == false)
.AndIF(!string.IsNullOrWhiteSpace(highSchoolRank.Province), c => c.Province == highSchoolRank.Province)
.AndIF(!string.IsNullOrWhiteSpace(highSchoolRank.City), c => c.City == highSchoolRank.City)
- .AndIF(!string.IsNullOrWhiteSpace(highSchoolRank.Area), c => c.City == highSchoolRank.Area)
+ .AndIF(!string.IsNullOrWhiteSpace(highSchoolRank.Area), c => c.Area == highSchoolRank.Area)
.AndIF(!string.IsNullOrWhiteSpace(highSchoolRank.Name), c => SqlFunc.Contains(highSchoolRank.Name, c.SchoolName))
.ToExpression();
var query = (await _d_HighSchoolRankServices.Query(exp)).Select(c => new HighSchoolRankResponse()
diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs
index 4cf7c3e..1f387c4 100644
--- a/New_College.Api/Controllers/HealthCheckController.cs
+++ b/New_College.Api/Controllers/HealthCheckController.cs
@@ -42,7 +42,7 @@ namespace New_College.Controllers
// return t_EnrollmentPlane.Import();
// return t_EnrollmentPlane.Importuniverbaseinfo();
- // return t_EnrollmentPlane.universitydetailupdate();
+ // return t_EnrollmentPlane.universitydetailupdate();
//return t_EnrollmentPlane.tradeupadte();
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index b0a78f3..b8b3434 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -3360,6 +3360,16 @@
0(新高考)，1，文科，2 理科
+
+
+ 姓名
+
+
+
+
+ 性别
+
+
选科文字展示
diff --git a/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs b/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs
index 74ef414..01fe524 100644
--- a/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs
+++ b/New_College.Model/ViewModels/Query/CustomerInfoQuery.cs
@@ -98,6 +98,15 @@ namespace New_College.Model.ViewModels
///
public int? Subject { get; set; } = -1;
+ ///
+ /// 姓名
+ ///
+ public string NickName { get; set; }
+
+ ///
+ /// 性别
+ ///
+ public int? Gender { get; set; }
///
/// 选科文字展示
///
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 5f973f5..7f86f46 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -1602,30 +1602,30 @@ namespace New_College.Services
///
public async Task Import()
{
- var universitylist = await d_UniversityRepository.Query();
- var plist = await this._PlanMajorDescRepository.Query(c => c.Location == "山东省" && c.Years == 2023);
- universitylist.ForEach(async u =>
- {
- plist.ForEach(async cc =>
- {
- if (cc.UId == u.Id)
- {
- cc.UId = u.Id;
- cc.ModifyTime = DateTime.Now;
- cc._985 = u.Nhef == 0 ? "否" : "是";
- cc._211 = u.Sff == 0 ? "否" : "是";
- cc._SYL = u.Syl == 0 ? "否" : "是";
- cc.AreaName = u.Area_Name;
- cc.Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作" : "港澳台";
- cc.Ownership = u.AscriptionName;
- cc.EducationCategory = u.Subject_Level == 0 ? "本科" : "专科";
- //0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他
- cc.SchoolType = UniversityTypeRelsove.GetType(u.Type);
- await this._PlanMajorDescRepository.Update(cc);
- }
+ // var universitylist = await d_UniversityRepository.Query();
+ // var plist = await this._PlanMajorDescRepository.Query(c => c.Location == "山东省" && c.Years == 2023);
+ //universitylist.ForEach(async u =>
+ //{
+ // plist.ForEach(async cc =>
+ // {
+ // if (cc.UId == u.Id)
+ // {
+ // cc.UId = u.Id;
+ // cc.ModifyTime = DateTime.Now;
+ // cc._985 = u.Nhef == 0 ? "否" : "是";
+ // cc._211 = u.Sff == 0 ? "否" : "是";
+ // cc._SYL = u.Syl == 0 ? "否" : "是";
+ // cc.AreaName = u.Area_Name;
+ // cc.Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作" : "港澳台";
+ // cc.Ownership = u.AscriptionName;
+ // cc.EducationCategory = u.Subject_Level == 0 ? "本科" : "专科";
+ // //0综合,1理工类，2医学类|3军事类|4语言类|5师范类|6财经类|7政法类|8民族类|9农林类|10艺术类|11体育类|12其他
+ // cc.SchoolType = UniversityTypeRelsove.GetType(u.Type);
+ // await this._PlanMajorDescRepository.Update(cc);
+ // }
- });
- });
+ // });
+ //});
// var p2list = await this.d_PlanMajorScoreLineRepository.Query(c => c.UniversityName == u.Name && c.UId <= 0);
@@ -1658,41 +1658,63 @@ namespace New_College.Services
//this.d_PlanMajorScoreLineRepository = d_PlanMajorScoreLineRepository;
//this.d_QualificationLineRepository = d_QualificationLineRepository;
- //var plandesc = await d_PlanMajorDescRepository.Query(c => c.Years == 2023 && c.Location == "山东省" );
- //var plandescline = await d_PlanMajorScoreLineRepository.Query(c => c.Years == 2022 && c.Location == "山东省");
- //plandesc.ForEach(async a =>
- //{
- // if (plandescline.Any(e => e.UId == a.UId && e.Major == a.Major && e.Location == a.Location)&&a.LowScore<=0)
- // {
- // var firstdefault = plandescline.FirstOrDefault(e => e.UId == a.UId && a.Major == e.Major && e.Location == a.Location);
- // a.LowScore = firstdefault.LowScore;
- // a.LowScoreRank = firstdefault.LowScoreRank;
- // a.ModifyTime = DateTime.Now;
- // await d_PlanMajorDescRepository.Update(a);
- // }
+ var plandesc = await d_PlanMajorDescRepository.Query(c => c.Years == 2021 && c.Location == "山东省");
+ var plandescline = await d_PlanMajorScoreLineRepository.Query(c => c.Years == 2021 && c.Location == "山东省");
+ plandesc.ForEach(async a =>
+ {
+
- //if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("(") && !string.IsNullOrEmpty(a.SelectSubject))
- //{
- // a.ModifyTime = DateTime.Now;
- // a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("(")[0], "");
- // a.Remark = a.Remark.Remove(0, 1);
- // a.Major = a.Major.Split("(")[0];
- // await d_PlanMajorDescRepository.Update(a);
- //}
- // });
+ if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("(") && !string.IsNullOrEmpty(a.SelectSubject))
+ {
+ a.ModifyTime = DateTime.Now;
+ a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("(")[0], "");
+ a.Remark = a.Remark.Remove(0, 1);
+ a.Major = a.Major.Split("(")[0];
+ await d_PlanMajorDescRepository.Update(a);
+ }
- //plandescline.ForEach(async a =>
- //{
- // if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("（") && !string.IsNullOrEmpty(a.SelectSubject))
- // {
- // a.ModifyTime = DateTime.Now;
- // a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("（")[0], "");
- // a.Remark = a.Remark.Remove(0, 1);
- // a.Major = a.Major.Split("（")[0];
- // await d_PlanMajorDescRepository.Update(a);
- // }
- //});
+ if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("（") && !string.IsNullOrEmpty(a.SelectSubject))
+ {
+ a.ModifyTime = DateTime.Now;
+ a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("（")[0], "");
+ a.Remark = a.Remark.Remove(0, 1);
+ a.Major = a.Major.Split("（")[0];
+ await d_PlanMajorDescRepository.Update(a);
+ }
+
+
+ if (plandescline.Any(e => e.UId == a.UId && e.Major == a.Major && e.Location == a.Location) && a.LowScore <= 0)
+ {
+ var firstdefault = plandescline.FirstOrDefault(e => e.UId == a.UId && a.Major == e.Major && e.Location == a.Location);
+ a.LowScore = firstdefault.LowScore;
+ a.LowScoreRank = firstdefault.LowScoreRank;
+ a.ModifyTime = DateTime.Now;
+ await d_PlanMajorDescRepository.Update(a);
+ }
+ });
+
+ plandescline.ForEach(async a =>
+ {
+
+ if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("(") && !string.IsNullOrEmpty(a.SelectSubject))
+ {
+ a.ModifyTime = DateTime.Now;
+ a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("(")[0], "");
+ a.Remark = a.Remark.Remove(0, 1);
+ a.Major = a.Major.Split("(")[0];
+ await d_PlanMajorDescRepository.Update(a);
+ }
+
+ if (!string.IsNullOrEmpty(a.Major) && a.Major.Contains("（") && !string.IsNullOrEmpty(a.SelectSubject))
+ {
+ a.ModifyTime = DateTime.Now;
+ a.Remark = a.Major.Remove(a.Major.Length - 1, 1).Replace(a.Major.Split("（")[0], "");
+ a.Remark = a.Remark.Remove(0, 1);
+ a.Major = a.Major.Split("（")[0];
+ await d_PlanMajorDescRepository.Update(a);
+ }
+ });
return true;
diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs
index d7c40ed..0908db8 100644
--- a/New_College.Services/D_PlanMajorDescServices.cs
+++ b/New_College.Services/D_PlanMajorDescServices.cs
@@ -69,8 +69,8 @@ namespace New_College.Services
.ToExpression();
var query = await _dal.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc ");
- var majorarry = query.data.Select(c => c.Major).ToArray();
- var universityarry = query.data.Select(c => c.UniversityName).ToArray();
+ var majorarry = query.data.Select(c => c.Major).Distinct().ToArray();
+ var universityarry = query.data.Select(c => c.UId).Distinct().ToArray();
Expression> expression2 = Expressionable.Create()
.And(c => c.IsDelete == false)
.And(c => c.Location == request.Location)
@@ -78,16 +78,14 @@ namespace New_College.Services
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject))
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName))
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
- //.And(c => c.Years == request.Year)
.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType)
- .AndIF(request.Score > 0, c => SqlFunc.Between(c.LowScore, request.Score - 15, request.Score + 15))
.AndIF(request.Syl.HasValue && request.Syl == 1, c => c._SYL == "是")
.AndIF(request._211.HasValue && request._211 == 1, c => c._211 == "是")
.AndIF(request._985.HasValue && request._985 == 1, c => c._985 == "是")
.AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership)
.AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature)
- .AndIF(query.data.Any(), c => SqlFunc.ContainsArray(majorarry, c.Major))
- .AndIF(query.data.Any(), c => SqlFunc.ContainsArray(universityarry, c.UniversityName))
+ .AndIF(majorarry.Any(), c => SqlFunc.ContainsArray(majorarry, c.Major))
+ .AndIF(universityarry.Any(), c => SqlFunc.ContainsArray(universityarry, c.UId))
//.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间
.ToExpression();
var list = (await _dal.Query(expression2)).Select(c => new D_PlanMajorDesc()
@@ -95,11 +93,12 @@ namespace New_College.Services
Major = c.Major,
MajorCode = c.MajorCode,
UniversityName = c.UniversityName,
+ UId = c.UId,
Years = c.Years,
LowScore = c.LowScore,
LowScoreRank = c.LowScoreRank,
PlanCount = c.PlanCount,
- AcademicYear = c.Years.ToString()
+ // AcademicYear = c.Years.ToString()
}).ToList();
var responselist = query.data.Select(c => new OneSubmitGoResponse()
@@ -122,12 +121,12 @@ namespace New_College.Services
UniversityCode = c.EnrollmentCode,
MajorCode = c.MajorCode,
LowScoreRank = c.LowScoreRank,
- PlanItems = list.Where(e => e.UniversityName.Equals(c.UniversityName) && e.Major.Equals(c.Major) && e.MajorCode.Equals(c.MajorCode)).Select(s => new PlanItem()
+ PlanItems = list.Where(e => e.UId == c.UId && e.Major.Equals(c.Major)).Select(s => new PlanItem()
{
PlanCount = s.PlanCount,
RankLine = s.LowScoreRank,
Scoreline = s.LowScore,
- Year = s.AcademicYear
+ Year = s.Years.ToString()
}).OrderByDescending(k => k.Year).ToList()
}).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).ToList();
diff --git a/New_College.Services/V_CustomerInfoServices.cs b/New_College.Services/V_CustomerInfoServices.cs
index 7696277..f531dc9 100644
--- a/New_College.Services/V_CustomerInfoServices.cs
+++ b/New_College.Services/V_CustomerInfoServices.cs
@@ -134,6 +134,10 @@ namespace New_College.Services
{
info.AreaId = query.AreaId;
}
+ if (query.Gender.HasValue&&query.Gender>0)
+ {
+ info.Gender = query.Gender.Value;
+ }
if (!string.IsNullOrEmpty(query.AreaName))
{
info.AreaName = query.AreaName;
@@ -142,6 +146,11 @@ namespace New_College.Services
{
info.Subject = query.Subject;
}
+ if (!string.IsNullOrEmpty(query.NickName))
+ {
+ info.NickName = query.NickName;
+ }
+
if (!string.IsNullOrEmpty(query.Subjectgroup))
{
info.Subjectgroup = query.Subjectgroup;