From fa7317a8a7bbe5d722be738374bdbefebda1a1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Wed, 15 May 2024 16:14:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Front/PcVolunteerController.cs | 5 +- .../Controllers/HealthCheckController.cs | 4 +- New_College.Api/appsettings.Development.json | 2 +- .../BASE/D_QualificationLineRepository.cs | 2 +- .../BASE/T_EnrollmentPlanedescRepository.cs | 2 +- New_College.Services/D_LongIdMapServices.cs | 54 +++++++++++-------- 6 files changed, 40 insertions(+), 29 deletions(-) diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index c917206..689cf5d 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -143,7 +143,7 @@ namespace New_College.Api.Controllers.Front } var uitem = new VolunteerTableDetailItemsView() { - // UniversityId = s.UniversityId, + UniversityName = s.UniversityName, UniversityCode = s.UniversityCode, Sort = s.OrderSort, @@ -152,9 +152,8 @@ namespace New_College.Api.Controllers.Front _985 = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("985") ? "是" : "否" : "否" : "否", _SYL = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel != null ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().LnstitutionalLevel.Contains("双一流") ? "是" : "否" : "否" : "否", Ownership = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("省") ? "省属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership.Contains("市") ? "市属" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Ownership : "", - //AreaName = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Province + "|" + planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().City : "", - AreaName = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Province + "|" + (planmajordesc.Any(e => e.UniversityName == s.UniversityName) ?planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().City:"") : "", + AreaName = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Province + "|" + (planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().City : "") : "", Nature = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Nature : "", Rank = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? (string.IsNullOrEmpty(planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().UniversityRank) ? "--" : planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().UniversityRank) : "--", planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem() diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs index d2d2694..4a4c90b 100644 --- a/New_College.Api/Controllers/HealthCheckController.cs +++ b/New_College.Api/Controllers/HealthCheckController.cs @@ -69,9 +69,9 @@ namespace New_College.Controllers //return d_LongIdMapServices.UpdateUniveristyInf(); //更新院校分数线 - // await d_LongIdMapServices.UpdateSchoolScoreLine23(); + // await d_LongIdMapServices.UpdateSchoolScoreLine23(); - // await d_LongIdMapServices.PlanNeedProSync("浙江省", 2023, "综合", "普通类二段"); + // await d_LongIdMapServices.PlanNeedProSync("浙江省", 2023, "综合", "普通类二段"); // await v_CustomerInfoServices.CustomeBillExport(); return true; } diff --git a/New_College.Api/appsettings.Development.json b/New_College.Api/appsettings.Development.json index d2d6749..518d39c 100644 --- a/New_College.Api/appsettings.Development.json +++ b/New_College.Api/appsettings.Development.json @@ -97,7 +97,7 @@ "DBType": 0, "Enabled": true, "HitRate": 20, - "Connection": "Server=192.168.104.108; Port=3306;SslMode=None;Database=volunteerapp; Uid=root; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true" + "Connection": "Server=192.168.104.108; Port=3306;SslMode=None;Database=volunteerapp; Uid=root; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true;SslMode=none" }, { "ConnId": "MYSQL_CasDoor", diff --git a/New_College.Repository/BASE/D_QualificationLineRepository.cs b/New_College.Repository/BASE/D_QualificationLineRepository.cs index b0b5e75..5db07b4 100644 --- a/New_College.Repository/BASE/D_QualificationLineRepository.cs +++ b/New_College.Repository/BASE/D_QualificationLineRepository.cs @@ -19,7 +19,7 @@ namespace New_College.Repository public async Task BatchAdd(List d_Qualifications) { - var kk = await this.Db.Fastest().PageSize(50000).BulkCopyAsync(d_Qualifications); + var kk = await this.Db.Fastest().BulkCopyAsync(d_Qualifications); return kk > 0; } diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index b741f07..0a02f57 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -252,7 +252,7 @@ namespace New_College.Repository } if (!string.IsNullOrWhiteSpace(query.SubjectClaim)) { - sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' )", claim01, claim02, claim03); + sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03,"不限"); } sqlstr.Append(" order by _23ScoreLine "); diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 60affc3..84eda54 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -1982,20 +1982,20 @@ namespace New_College.Services var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); - var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); - //var universitylist = await d_UniversityRepository.Query(); - planlist.ForEach(a => - { - var lany = list.Where(e => e.MajorCode == a.MajorCode && e.Major == a.Major && e.UniversityName == a.UniversityName); - if (lany.Any()) - { - var aa = lany.FirstOrDefault(); - a.UId = aa.UId; - a.BatchName = aa.BatchName; - } - }); + //var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省"); + var universitylist = await d_UniversityRepository.Query(); + //planlist.ForEach(a => + //{ + // var lany = list.Where(e => e.MajorCode == a.MajorCode && e.Major == a.Major && e.UniversityName == a.UniversityName); + // if (lany.Any()) + // { + // var aa = lany.FirstOrDefault(); + // a.UId = aa.UId; + // a.BatchName = aa.BatchName; + // } + //}); - await d_PlanMajorDescProRepository.Batchupdate(planlist); + //await d_PlanMajorDescProRepository.Batchupdate(planlist); //list.ForEach(c => //{ @@ -2004,28 +2004,40 @@ namespace New_College.Services // c.UId = universitylist.Where(e => e.Name == c.UniversityName).FirstOrDefault().Id; // } //}); - await d_PlanMajorScoreLineRepository.BatchUpdate(list); + //await d_PlanMajorScoreLineRepository.BatchUpdate(list); var unlist = list.Select(c => c.UniversityName).Distinct().ToList(); unlist.ForEach(a => { var models = list.Where(e => e.UniversityName == a).FirstOrDefault(); //先找出院校最低分 - dsQualification.Add(new D_QualificationLine() + var newmodel = new D_QualificationLine() { Years = models.Years, UniversityName = a, + AreaName = universitylist.Where(c => c.Name == a).FirstOrDefault().Name, + EducationType = universitylist.Where(c => c.Name == a).FirstOrDefault().Subject_Level == 0 ? "本科" : "专科", + ModifyTime = DateTime.Now, + Ownership = universitylist.Where(c => c.Name == a).FirstOrDefault().AscriptionName, + // RecruitCode = universitylist.Where(c => c.Name == a).FirstOrDefault().UniversityCode, + RecruitType = "", CreateTime = DateTime.Now, IsDelete = false, Location = models.Location, OrderSort = 0, UId = models.UId, LowScore = list.Where(e => e.UniversityName == a).Select(c => c.LowScore).Min(), - LowScoreRank = list.Where(e => e.UniversityName == a).Select(c => c.LowScoreRank).Max() - }); + LowScoreRank = list.Where(e => e.UniversityName == a).Select(c => c.LowScoreRank).Max(), + SubjectType = "综合", + BatchName = "普通批", + }; + dsQualification.Add(newmodel); + // await d_QualificationLineRepository.Add(newmodel); + }); + //var tt = dsQualification; + dsQualification.ForEach(async c => + { + await d_QualificationLineRepository.Add(c); }); - var tt = dsQualification; - await d_QualificationLineRepository.BatchAdd(dsQualification); - return true; } @@ -2277,7 +2289,7 @@ namespace New_College.Services var needlist = new List(); var universitylist = await d_UniversityRepository.Query(); var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == location); - var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.BatchName == batchname && c.IsDelete == false); + var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == location && c.Years == years && c.BatchName == null && c.IsDelete == false); var countid = (await this.t_TbSNeedDataInfoRepository.Query()).OrderByDescending(c => c.ID).FirstOrDefault().ID; plist.ForEach(a => {