s

New_College.Api/Controllers/Front/PcVolunteerController.cs

@@ -141,22 +141,23 @@ namespace New_College.Api.Controllers.Front
                 {
                     typeinfo = s.VolunteerRemark.FromJson<List<VolteerItem>>();
                 }
+                var planstatus = planmajordesc.Any(e => e.UniversityName == s.UniversityName);
+                var firstmodels = planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault();
                 var uitem = new VolunteerTableDetailItemsView()
                 {
-                    // UniversityId = s.UniversityId,
+
                     UniversityName = s.UniversityName,
                     UniversityCode = s.UniversityCode,
                     Sort = s.OrderSort,
                     UniversityId = s.UniversityId,
-                    _211 = 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("211") ? "是" : "否" : "否" : "否",
+                    _211 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.LnstitutionalLevel.Contains("211") ? "是" : "否" : "否" : "否",
-                    _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") ? "是" : "否" : "否" : "否",
+                    _985 = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.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("双一流") ? "是" : "否" : "否" : "否",
+                    _SYL = planstatus ? firstmodels.LnstitutionalLevel != null ? firstmodels.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 : "",
+                    Ownership = planstatus ? firstmodels.Ownership != null ? firstmodels.Ownership.Contains("省") ? "省属" : firstmodels.Ownership.Contains("市") ? "市属" : firstmodels.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 = planstatus ? firstmodels.Province != null ? firstmodels.Province + "|" + (planstatus ? firstmodels.City : "") : "" : "",
-                    Nature = planmajordesc.Any(e => e.UniversityName == s.UniversityName) ? planmajordesc.Where(e => e.UniversityName == s.UniversityName).FirstOrDefault().Nature : "",
+                    Nature = planstatus ? firstmodels.Nature != null ? firstmodels.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) : "--",
+                    Rank = planstatus ? (string.IsNullOrEmpty(firstmodels.UniversityRank) ? "--" : firstmodels.UniversityRank) : "--",
                     planMajorItems = planmajordesc.Where(ww => planids.Contains(ww.ID)).Select(c => new VolunteerTablePlanMajorItem()
                     {
 
@@ -175,21 +176,21 @@ namespace New_College.Api.Controllers.Front
                         PlanItems = new List<PlanItem>()
                          {
                                 new PlanItem() {
-                                 PlanCount=int.Parse(c._23Count),
+                                 PlanCount=c._23Count=="0"?"--":c._23Count,
-                                 RankLine=int.Parse(c._23ScoreLine),
+                                 RankLine=c._23ScoreLine=="0"?"--":c._23ScoreLine,
-                            Scoreline=int.Parse(c._23Score),
+                            Scoreline=c._23Score == "0" ? "--" : c._23Count,
                              Year="2023"
                              },
                              new PlanItem() {
-                                 PlanCount=int.Parse(c._22Count),
+                                 PlanCount=c._22Count=="0"?"--":c._22Count,
-                                 RankLine=int.Parse(c._22ScoreLine),
+                                 RankLine=c._22ScoreLine=="0"?"--":c._22ScoreLine,
-                          Scoreline=int.Parse(c._22Score),
+                            Scoreline=c._22Score == "0" ? "--" : c._22Count,
                           Year="2022"
                              },
                              new PlanItem() {
-                                 PlanCount=int.Parse(c._21Count),
+                              PlanCount=c._21Count=="0"?"--":c._21Count,
-                         RankLine=int.Parse(c._21ScoreLine),
+                                 RankLine=c._21ScoreLine=="0"?"--":c._21ScoreLine,
-                          Scoreline=int.Parse(c._21Score),
+                            Scoreline=c._21Score == "0" ? "--" : c._21Count,
                            Year="2021"
                           } }
                     }).ToList()

New_College.Api/Controllers/Front/TestController.cs

@@ -93,7 +93,6 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-      
         public async Task<MessageModel<List<appQuestionResult>>> GetQuestion([FromQuery] appQuestionQuery query)
         {
             var result = await test_QuestionInfoServices.GetQuestion(query);
@@ -110,7 +109,6 @@ namespace New_College.Api.Controllers.Front
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-      
         public async Task<MessageModel<List<QuestionMBTI>>> GetQuestionMBTI()
         {
             var result = await test_QuestionInfoServices.GetQuestionMBTI();

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;
         }

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",

New_College.IServices/ID_LongIdMapServices.cs

@@ -28,7 +28,7 @@ namespace New_College.IServices
         /// </summary>
         /// <returns></returns>
         Task<bool> UpdatePlanScoreLine();
-        Task<bool> UpdateSchoolScoreLine23();
+        Task<bool> UpdateSchoolScoreLine23(string Location);
         Task<bool> UpdatePlanProInf();
         Task<bool> Import();
 

New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs

@@ -364,17 +364,17 @@ namespace New_College.Model.ViewModels
     public class PlanItem
     {
         public string Year { get; set; }
-        public int PlanCount { get; set; }
+        public string PlanCount { get; set; }
         public string Count { get; set; }
         /// <summary>
         /// 位次
         /// </summary>
-        public int RankLine { get; set; }
+        public string RankLine { get; set; }
 
         ///// <summary>
         ///// 最低分
         ///// </summary>
-        public int Scoreline { get; set; }
+        public string Scoreline { get; set; }
     }
 
 

New_College.Repository/BASE/D_QualificationLineRepository.cs

@@ -19,7 +19,7 @@ namespace New_College.Repository
 
         public async Task<bool> BatchAdd(List<D_QualificationLine>  d_Qualifications)
         {
-            var kk = await this.Db.Fastest<D_QualificationLine>().PageSize(50000).BulkCopyAsync(d_Qualifications);
+            var kk = await this.Db.Fastest<D_QualificationLine>().BulkCopyAsync(d_Qualifications);
             return kk > 0;
         }
 

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 ");
 

New_College.Services/D_LongIdMapServices.cs

@@ -1975,27 +1975,27 @@ namespace New_College.Services
         /// 
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> UpdateSchoolScoreLine23()
+        public async Task<bool> UpdateSchoolScoreLine23(string Location)
         {
 
             var dsQualification = new List<D_QualificationLine>();
 
-            var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省");
+            var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == Location);
 
-            var planlist = await d_PlanMajorDescProRepository.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();
+            var universitylist = await d_UniversityRepository.Query();
-            planlist.ForEach(a =>
+            //planlist.ForEach(a =>
-            {
+            //{
-                var lany = list.Where(e => e.MajorCode == a.MajorCode && e.Major == a.Major && e.UniversityName == a.UniversityName);
+            //    var lany = list.Where(e => e.MajorCode == a.MajorCode && e.Major == a.Major && e.UniversityName == a.UniversityName);
-                if (lany.Any())
+            //    if (lany.Any())
-                {
+            //    {
-                    var aa = lany.FirstOrDefault();
+            //        var aa = lany.FirstOrDefault();
-                    a.UId = aa.UId;
+            //        a.UId = aa.UId;
-                    a.BatchName = aa.BatchName;
+            //        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();
+            var unlist = list.Select(c => c.UId).Distinct().ToList();
             unlist.ForEach(a =>
             {
-                var models = list.Where(e => e.UniversityName == a).FirstOrDefault();
+                var models = list.Where(e => e.UId == a).FirstOrDefault();
                 //先找出院校最低分
-                dsQualification.Add(new D_QualificationLine()
+                var newmodel = new D_QualificationLine()
                 {
                     Years = models.Years,
-                    UniversityName = a,
+                    UniversityName = models.UniversityName,
+                    AreaName = universitylist.Where(c => c.Id == a).FirstOrDefault().Name,
+                    EducationType = universitylist.Where(c => c.Id == a).FirstOrDefault().Subject_Level == 0 ? "本科" : "专科",
+                    ModifyTime = DateTime.Now,
+                    Ownership = universitylist.Where(c => c.Id == 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(),
+                    LowScore = list.Where(e => e.UId == a).Select(c => c.LowScore).Min(),
-                    LowScoreRank = list.Where(e => e.UniversityName == a).Select(c => c.LowScoreRank).Max()
+                    LowScoreRank = list.Where(e => e.UId == a).Select(c => c.LowScoreRank).Max(),
-                });
+                    SubjectType = models.SubjectType,
+                    BatchName = models.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;
         }
 
@@ -2283,38 +2295,41 @@ namespace New_College.Services
             {
                 countid++;
                 var u = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault();
-                needlist.Add(new T_TbSNeedDataInfo()
+                if (u != null)
                 {
-                    ID = countid,
+                    needlist.Add(new T_TbSNeedDataInfo()
-                    AcademicYear = a.AcademicYear,
+                    {
-                    // City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name
+                        ID = countid,
-                    Province = u.Area_Name,
+                        AcademicYear = a.AcademicYear,
-                    EducationCategory = u.Subject_Level == 0 ? "本科" : "专科",
+                        // City = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Area_Name
-                    EnrollmentCode = u.UniversityCode,
+                        Province = u.Area_Name,
-                    Fee = a.Free,
+                        EducationCategory = u.Subject_Level == 0 ? "本科" : "专科",
-                    Location = a.Location,
+                        EnrollmentCode = u.UniversityCode,
-                    MajorCode = a.MajorCode,
+                        Fee = a.Free,
-                    MajorName = a.Major,
+                        Location = a.Location,
-                    MastersDegree = u.Master_Count.ToString(),
+                        MajorCode = a.MajorCode,
-                    UniversityName = a.UniversityName,
+                        MajorName = a.Major,
-                    Ownership = u.AscriptionName,
+                        MastersDegree = u.Master_Count.ToString(),
-                    Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : "港澳台",
+                        UniversityName = a.UniversityName,
-                    Remark = a.Remark,
+                        Ownership = u.AscriptionName,
-                    PhDPoint = u.Doctorate_Count.ToString(),
+                        Nature = u.Nature == 0 ? "公办" : u.Nature == 1 ? "民办" : u.Nature == 2 ? "中外合作办学" : "港澳台",
-                    SubjectType = subjectType,
+                        Remark = a.Remark,
-                    _23subject = a.SelectSubject,
+                        PhDPoint = u.Doctorate_Count.ToString(),
-                    _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",
+                        SubjectType = subjectType,
-                    _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",
+                        _23subject = a.SelectSubject,
-                    _23ScoreLine = 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().LowScoreRank.ToString() : "0",
+                        _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",
-                    _22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && 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",
-                    _22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
+                        _23ScoreLine = 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().LowScoreRank.ToString() : "0",
-                    _22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
+                        _22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
-                    _21Count = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
+                        _22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
-                    _21Score = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
+                        _22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
-                    _21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
+                        _21Count = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
-                    _23SchoolScoreLine = 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).Select(c => c.LowScoreRank).Max().ToString() : "0",
+                        _21Score = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
-                    _23SchoolScore = 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).Select(c => c.LowScore).Min().ToString() : "0"
+                        _21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
-                });
+                        _23SchoolScoreLine = 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).Select(c => c.LowScoreRank).Max().ToString() : "0",
+                        _23SchoolScore = 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).Select(c => c.LowScore).Min().ToString() : "0"
+                    });
+                }
 
             });
             var tt = needlist;

New_College.Services/D_PlanMajorDescServices.cs

@@ -299,25 +299,24 @@ namespace New_College.Services
                     Percentage = MajorPlanScoreTool.GetPlanPercentage(int.Parse(t._23Score), request.Score),
                     PlanItems = new List<PlanItem>()
                     {
-                         new PlanItem() {
+                            new PlanItem() {
-                        PlanCount=int.Parse(t._23Count),
+                                 PlanCount=t._23Count,
-                        RankLine=int.Parse(t._23ScoreLine),
+                                 RankLine=t._23ScoreLine,
-                         Scoreline=int.Parse(t._23Score),
+                            Scoreline=t._23Score,
-                         Year="2023"
+                             Year="2023"
-                        },
+                             },
-                        new PlanItem() {
+                             new PlanItem() {
-                        PlanCount=int.Parse(t._22Count),
+                                 PlanCount=t._22Count,
-                        RankLine=int.Parse(t._22ScoreLine),
+                                 RankLine=t._22ScoreLine,
-                         Scoreline=int.Parse(t._22Score),
+                          Scoreline=t._22Score,
-                         Year="2022"
+                          Year="2022"
-                        },
+                             },
-                         new PlanItem() {
+                             new PlanItem() {
-                          PlanCount=int.Parse(t._21Count),
+                                 PlanCount=t._21Count,
-                        RankLine=int.Parse(t._21ScoreLine),
+                         RankLine=t._21ScoreLine,
-                         Scoreline=int.Parse(t._21Score),
+                          Scoreline=t._21Score,
-                          Year="2021"
+                           Year="2021"
-                         },
+                    } }
-                    }
                 }).ToList();
 
             });
@@ -413,23 +412,23 @@ namespace New_College.Services
                 LowScore = int.Parse(c._23SchoolScore),
                 PlanItems = new List<PlanItem>()
                 {
-                       new PlanItem() {
+                         new PlanItem() {
-                        PlanCount=int.Parse(c._23Count),
+                                 PlanCount=c._23Count,
-                        RankLine=int.Parse(c._23ScoreLine),
+                                 RankLine=c._23ScoreLine,
-                         Scoreline=int.Parse(c._23Score),
+                            Scoreline=c._23Score,
-                         Year="2023"
+                             Year="2023"
-                        },
+                             },
-                        new PlanItem() {
+                             new PlanItem() {
-                        PlanCount=int.Parse(c._22Count),
+                                 PlanCount=c._22Count,
-                        RankLine=int.Parse(c._22ScoreLine),
+                                 RankLine=c._22ScoreLine,
-                         Scoreline=int.Parse(c._22Score),
+                          Scoreline=c._22Score,
-                         Year="2022"
+                          Year="2022"
-                        },
+                             },
-                    new PlanItem() {
+                             new PlanItem() {
-                          PlanCount=int.Parse(c._21Count),
+                                 PlanCount=c._21Count,
-                        RankLine=int.Parse(c._21ScoreLine),
+                         RankLine=c._21ScoreLine,
-                         Scoreline=int.Parse(c._21Score),
+                          Scoreline=c._21Score,
-                          Year="2021"
+                           Year="2021"
                          },
                 }
             }).ToList();

New_College.Services/T_EnrollmentPlanedescServices.cs

@@ -616,25 +616,24 @@ namespace New_College.Services
                     AcademicYear = item.AcademicYear,
                     planItems = new List<PlanItem>()
                     {
-                        new PlanItem() {
+                              new PlanItem() {
-                        PlanCount=int.Parse(item._23Count),
+                                 PlanCount=item._23Count,
-                        RankLine=int.Parse(item._22ScoreLine),
+                                 RankLine=item._23ScoreLine,
-                         Scoreline=int.Parse(item._23Score),
+                            Scoreline=item._23Score,
-                         Year="2023"
+                             Year="2023"
-                        },
+                             },
-                        new PlanItem() {
+                             new PlanItem() {
-                        PlanCount=int.Parse(item._22Count),
+                                 PlanCount=item._22Count,
-                        RankLine=int.Parse(item._22ScoreLine),
+                                 RankLine=item._22ScoreLine,
-                         Scoreline=int.Parse(item._22Score),
+                          Scoreline=item._22Score,
-                         Year="2022"
+                          Year="2022"
-                        },
+                             },
-                        new PlanItem() {
+                             new PlanItem() {
-                          PlanCount=int.Parse(item._21Count),
+                                 PlanCount=item._21Count,
-                        RankLine=int.Parse(item._21ScoreLine),
+                         RankLine=item._21ScoreLine,
-                         Scoreline=int.Parse(item._21Score),
+                          Scoreline=item._21Score,
-                          Year="2021"
+                           Year="2021"
-                         },
+                    } }
-                    }
                 });
             }
             return new MessageModel<PageModel<PlanDescList>>()