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

dasd

develop
old易 2024-06-24 16:28:31 +08:00
parent b36343c2d1
commit c3b0f0fc4b
4 changed files with 237 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
New_College.Api/Controllers/HealthCheckController.cs
View File

@ -69,12 +69,16 @@ namespace New_College.Controllers
//return d_LongIdMapServices.UpdateUniveristyInf();
//更新院校分数线
// await d_LongIdMapServices.UpdateSchoolScoreLine23("河南省","理科");
// await d_LongIdMapServices.UpdateSchoolScoreLine23("河南省","理科");
// await d_LongIdMapServices.PlanNeedProSync("山东省", 2024, "综合", "普通类一段");
// await d_LongIdMapServices.SyncnewNeedProSData("山东省", 2024, "综合", "普通类一段");
await d_LongIdMapServices.PlanNeedProSync("上海市", 2023, "综合", "专科");
// await v_CustomerInfoServices.CustomeBillExport();
// await d_LongIdMapServices.UpdatePlanProInf();
// await d_LongIdMapServices.UpdatePlanProInf();
await d_LongIdMapServices.UpdatePlanProInf();
return true;
}

3
New_College.IServices/ID_LongIdMapServices.cs
View File

@ -14,6 +14,9 @@ namespace New_College.IServices
public interface ID_LongIdMapServices : IBaseServices<D_LongIdMap>
{
Task<bool> SyncnewNeedProSData(string location, int years, string subjectType, string batchname);
/// <summary>
/// 同步融合表
/// </summary>

11
New_College.Model/Models/T_TbSNeedDataInfo.cs
View File

@ -19,6 +19,17 @@ namespace New_College.Model.Models
/// </summary>
[SugarColumn(ColumnName = "EnrollmentType")]
public string EnrollmentType { get; set; }
/// <summary>
/// batchName
/// </summary>
[SugarColumn(ColumnName = "BatchName")]
public string BatchName { get; set; }
/// <summary>
/// 全国统一招生代码
/// </summary>

281
New_College.Services/D_LongIdMapServices.cs
View File

@ -28,6 +28,8 @@ using Org.BouncyCastle.Asn1.Tsp;
using Newtonsoft.Json;
using MySqlX.XDevAPI.Common;
using NPOI.SS.Formula.Functions;
using StackExchange.Profiling.Internal;
using static Google.Protobuf.Reflection.SourceCodeInfo.Types;
namespace New_College.Services
{
@ -923,6 +925,11 @@ namespace New_College.Services
List<NewPlanDescList> list = new List<NewPlanDescList>() { };
foreach (var item in info)
{
string scoreline = item.LowScore == 0 || string.IsNullOrWhiteSpace(item.LowScore.ToString()) ? "--" : item.LowScore.ToString();
if (query.Year > 2023)
{
scoreline = "--";
}
list.Add(new NewPlanDescList()
{
Name = item.Major,
@ -930,7 +937,7 @@ namespace New_College.Services
SelectSubject = item.SelectSubject,
Money = string.IsNullOrWhiteSpace(item.Free) || item.Free == "0" || item.Free == "待定" ? "--" : item.Free,
PlanNum = item.PlanCount,
Scoreline = item.LowScore == 0 || string.IsNullOrWhiteSpace(item.LowScore.ToString()) ? "--" : item.LowScore.ToString()
Scoreline = scoreline
});
}
return list;
@ -2212,7 +2219,7 @@ namespace New_College.Services
if (unimglist != null && unimglist.isSuccess)
{
models.Imglist = unimglist.result.urls.Select(c => c.url).ToList().ToJson();
// models.Imglist = unimglist.result.urls.Select(c => c.url).ToList().ToJson();
}
}
models.VrUrl = universityimglist.Where(e => e.UniversityId == university.Id).Select(c => c.VRUrl).FirstOrDefault();
@ -2273,9 +2280,135 @@ namespace New_College.Services
/// <summary>
/// 更新最新的招生计划数据
/// </summary>
/// <param name="location"></param>
/// <param name="years"></param>
/// <param name="subjectType"></param>
/// <param name="batchname"></param>
/// <returns></returns>
public async Task<bool> SyncnewNeedProSData(string location, int years, string subjectType, string batchname)
{
var oldplist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == 2023 && c.SubjectType == subjectType && c.BatchName == batchname && c.IsDelete == false);
var newplist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.SubjectType == subjectType && c.BatchName == batchname && c.IsDelete == false);
newplist.ForEach(a =>
{
if (oldplist.Where(e => e.UId == a.UId).Any())
{
var u = oldplist.Where(e => e.UId == a.UId).FirstOrDefault();
if (oldplist.Where(e => e.UId == a.UId && e.MajorCode == a.MajorCode).Any())
{
var m = oldplist.Where(e => e.UId == a.UId && e.MajorCode == a.MajorCode);
}
//if (string.IsNullOrWhiteSpace(a.CityName))
//{
// a.CityName = u.CityName;
//}
//if (string.IsNullOrWhiteSpace(a.AreaName))
//{
// a.AreaName = u.AreaName;
//}
//if (string.IsNullOrWhiteSpace(a.EducationCategory))
//{
// a.EducationCategory = u.EducationCategory;
//}
//if (string.IsNullOrWhiteSpace(a.EnrollmentCode))
//{
// a.EnrollmentCode = u.EnrollmentCode;
//}
//if (string.IsNullOrWhiteSpace(a.EnrollmentType))
//{
// a.EnrollmentType = u.EnrollmentType;
//}
//if (string.IsNullOrWhiteSpace(a.FirstType))
//{
// if (m.Any())
// {
// a.FirstType = m.FirstOrDefault().FirstType;
// }
//}
//if (string.IsNullOrWhiteSpace(a.FormerName))
//{
// a.FormerName = u.FormerName;
//}
//if (string.IsNullOrWhiteSpace(a.Logo))
//{
// a.Logo = u.Logo;
//}
//if (a.LowScore <= 0)
//{
// if (m.Any())
// {
// a.LowScore = m.FirstOrDefault().LowScore;
// }
//}
//if (a.LowScoreRank <= 0)
//{
// if (m.Any())
// {
// a.LowScoreRank = m.FirstOrDefault().LowScoreRank;
// }
//}
//if (string.IsNullOrWhiteSpace(a.Nature))
//{
// a.Nature = u.Nature;
//}
//if (a.NewCount <= 0)//差值
//{
// if (m.Any())
// {
// a.NewCount = a.PlanCount - m.FirstOrDefault().PlanCount;
// }
//}
//if (string.IsNullOrWhiteSpace(a.Ownership))
//{
// a.Ownership = u.Ownership;
//}
//if (string.IsNullOrWhiteSpace(a.Rank))
//{
// a.Rank = u.Rank;
//}
//if (string.IsNullOrWhiteSpace(a.RootType))
//{
// if (m.Any())
// {
// a.RootType = m.FirstOrDefault().RootType;
// }
//}
//if (string.IsNullOrWhiteSpace(a.SchoolType))
//{
// if (m.Any())
// {
// a.SchoolType = m.FirstOrDefault().SchoolType;
// }
//}
//if (string.IsNullOrWhiteSpace(a._211))
//{
// a._211 = u._211;
//}
//if (string.IsNullOrWhiteSpace(a._985))
//{
// a._985 = u._985;
//}
//if (string.IsNullOrWhiteSpace(a._SYL))
//{
// a._SYL = u._SYL;
//}
}
});
return await this.d_PlanMajorDescProRepository.Batchupdate(newplist);
}
/// <summary>
/// 同步need表数据
/// </summary>
@ -2315,7 +2448,10 @@ namespace New_College.Services
Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : u.Nature == 3 ? "港澳台" : "独立学院",
Remark = a.Remark,
PhDPoint = u.Doctorate_Count.ToString(),
_plancount = a.PlanCount,
BatchName = a.BatchName,
SubjectType = subjectType,
_24subject = a.SelectSubject,
_23subject = a.SelectSubject,
_23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
_23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
@ -2343,8 +2479,8 @@ namespace New_College.Services
public async Task<bool> UpdatePlanProInf()
{
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
// var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
#region************************更新招生计划合计****************************
@ -2381,43 +2517,58 @@ namespace New_College.Services
#region ***********************更新相关参数***************************
//var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
// var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == "山东省");
tbinfo.ForEach(o =>
{
if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
{
if (o._21Score == "0")
{
o._21Score = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
o._21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
o._21Count = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
}
//tbinfo.ForEach(e =>
//{
if (o._22Score == "0")
{
o._22Score = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
o._22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
o._22Count = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
}
}
//if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName))
//{
// if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName))
// {
// e.UniversityRank = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().UniversityRank;
// e.City = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().City;
// e.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EmploymentQuality;
// e.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EnrollmentCode;
// if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)))
// {
// e.Fee = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().Fee;
// e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel;
// e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel;
// e.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel;
// e.FirstType = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().FirstType;
// }
//e.UniversityRank = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().UniversityRank;
//e.City = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().City;
//e.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EmploymentQuality;
//e.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().EnrollmentCode;
//if (tbsdinfo.Any(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)))
//{
// e.Fee = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().Fee;
// e.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().MjaorLevel;
// e.MajorCount = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel;
// e.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().LnstitutionalLevel;
// e.FirstType = tbsdinfo.Where(a => a.UniversityName == e.UniversityName && a.MajorName.Contains(e.MajorName)).FirstOrDefault().FirstType;
//}
// e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel;
//e.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().LnstitutionalLevel;
// e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree;
// e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor;
//e.MastersDegree = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersDegree;
//e.MastersMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().MastersMajor;
// e.Nature = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Nature;
// e.Ownership = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Ownership;
// e.PhDMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDMajor;
// e.PhDPoint = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDPoint;
// e.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().ProfessionalAssessment;
// e.Province = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Province;
// e.VRUrl = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().VRUrl;
// }
//});
//await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
//e.Nature = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Nature;
//e.Ownership = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Ownership;
//e.PhDMajor = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDMajor;
//e.PhDPoint = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().PhDPoint;
//e.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().ProfessionalAssessment;
//e.Province = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().Province;
//e.VRUrl = tbsdinfo.Where(a => a.UniversityName == e.UniversityName).FirstOrDefault().VRUrl;
// }
});
await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
#endregion
@ -2456,39 +2607,39 @@ namespace New_College.Services
//var universitylist=await un
#region 更新专业计划信息
//var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0);
var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2023 && c.IsDelete == false);
plist.ForEach(p =>
{
//var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault();
//if (newmodel != null)
//{
var universitymodel = universitylist.Where(e => e.Id == p.UId).FirstOrDefault();
if (universitymodel != null)
{
// p.CityName = universitymodel.Area_Name;
// p.EducationCategory = universitymodel.;
p.EnrollmentCode = universitymodel.UniversityCode;
// p.EnrollmentType = newmodel.EnrollmentType;
//p.SchoolType=newmodel.sch
//p.FirstType = universitymodel.FirstType;
// p.Nature = universitymodel.Nature;
p.Ownership = universitymodel.AscriptionName;
p.Web = universitymodel.Web;
p.Logo = universitymodel.Logo;
p._985 = universitymodel.Nhef == 1 ? "是" : "否";
p._211 = universitymodel.Sff == 1 ? "是" : "否";
p._SYL = universitymodel.Syl == 1 ? "是" : "否";
p.Rank = (universitymodel.Rank == 0 || universitymodel.Rank == 9999) ? "--" : universitymodel.Rank.ToString();
//p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count);
//p.PlanCount = int.Parse(newmodel._23Count);
//p.LowScore = int.Parse(newmodel._23Score);
//p.LowScoreRank = int.Parse(newmodel._23ScoreLine);
//var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2023 && c.IsDelete == false);
//plist.ForEach(p =>
//{
// //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault();
// //if (newmodel != null)
// //{
// var universitymodel = universitylist.Where(e => e.Id == p.UId).FirstOrDefault();
// if (universitymodel != null)
// {
// // p.CityName = universitymodel.Area_Name;
// // p.EducationCategory = universitymodel.;
// p.EnrollmentCode = universitymodel.UniversityCode;
// // p.EnrollmentType = newmodel.EnrollmentType;
// //p.SchoolType=newmodel.sch
// //p.FirstType = universitymodel.FirstType;
// // p.Nature = universitymodel.Nature;
// p.Ownership = universitymodel.AscriptionName;
// p.Web = universitymodel.Web;
// p.Logo = universitymodel.Logo;
// p._985 = universitymodel.Nhef == 1 ? "是" : "否";
// p._211 = universitymodel.Sff == 1 ? "是" : "否";
// p._SYL = universitymodel.Syl == 1 ? "是" : "否";
// p.Rank = (universitymodel.Rank == 0 || universitymodel.Rank == 9999) ? "--" : universitymodel.Rank.ToString();
// //p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count);
// //p.PlanCount = int.Parse(newmodel._23Count);
// //p.LowScore = int.Parse(newmodel._23Score);
// //p.LowScoreRank = int.Parse(newmodel._23ScoreLine);
}
// }
});
//});
await this.d_PlanMajorDescProRepository.Batchupdate(plist);
//await this.d_PlanMajorDescProRepository.Batchupdate(plist);
#endregion
#region 更新专业分数先选科数据