Merge branch 'develop' of http://192.168.100.104:49153/Volunteer/newgaokao into develop

New_College.Api/Controllers/Front/FrontSelectionController.cs

@@ -126,17 +126,23 @@ namespace New_College.Api.Controllers.Front
            .And(w => w.AcademicYear == DateTime.Now.Year.ToString())
          .ToExpression();//注意 这一句 不能少
             var subjectlist = await _selectionServices.Query(exp);
-            response = subjectlist.Select(c => new SelectionResponseDto()
+            var rplist = subjectlist.Select(c => new SelectionMajorDto()
             {
-                MajorName = c.MajorName
+                MajorName = c.MajorName.Contains("(") ? c.MajorName.Split('(')[0].ToString() : c.MajorName
-            }).ToList();
+            }).DistinctBy(c => c.MajorName).ToList();
-            response.ForEach(a =>
+
+            rplist.ForEach(a =>
             {
-                a.selects = subjectlist.Where(e => e.MajorName == a.MajorName).Select(c => new SelectResponseDto()
+                var selectlist = subjectlist.Where(e => e.MajorName.Contains(a.MajorName)).Select(c => new SelectResponseDto()
                 {
-                   Selection = c.Selection,
+                    Selection = c.Selection.ToString(),
-                    UniversityName = c.UniversityName
+                    UniversityName = c.UniversityName.ToString()
-                }).ToList();
+                }).Distinct().ToList();
+                response.Add(new SelectionResponseDto()
+                {
+                    selects = selectlist,
+                    MajorName = a.MajorName
+                });
             });
             return new MessageModel<List<SelectionResponseDto>>()
             {

New_College.Api/Controllers/HealthCheckController.cs

@@ -69,12 +69,12 @@ namespace New_College.Controllers
 
             //return d_LongIdMapServices.UpdateUniveristyInf();
             //更新院校分数线
-            //await d_LongIdMapServices.UpdateSchoolScoreLine23("四川省");
+           await d_LongIdMapServices.UpdateSchoolScoreLine23("河南省","理科");
 
            // await d_LongIdMapServices.PlanNeedProSync("四川省", 2023, "文科", "专科");
             //  await v_CustomerInfoServices.CustomeBillExport();
 
-            await d_LongIdMapServices.UpdatePlanProInf();
+           // await d_LongIdMapServices.UpdatePlanProInf();
             return true;
         }
 

New_College.IServices/ID_LongIdMapServices.cs

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

New_College.Model/ViewModels/Result/UniversityResult.cs

@@ -155,6 +155,7 @@ namespace New_College.Model.ViewModels
   
         public string collegeCode { get; set; }
 
+        public int Rank { get; set; }
         /// <summary>
         /// 官网
         /// </summary>

New_College.Model/ViewModels/SelectionResponseDto.cs

@@ -14,6 +14,11 @@ namespace New_College.Model
 
     }
 
+    public class SelectionMajorDto
+    {
+        public string MajorName { get; set; }
+    }
+
     public class SelectResponseDto
     {
         public string UniversityName { get; set; }

New_College.Services/D_LongIdMapServices.cs

@@ -1975,12 +1975,12 @@ namespace New_College.Services
         /// 
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> UpdateSchoolScoreLine23(string Location)
+        public async Task<bool> UpdateSchoolScoreLine23(string Location, string subjectType)
         {
 
             var dsQualification = new List<D_QualificationLine>();
 
-            var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == Location);
+            var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == Location && e.SubjectType == subjectType);
 
             //var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省");
             var universitylist = await d_UniversityRepository.Query();
@@ -2181,7 +2181,7 @@ namespace New_College.Services
                     Phone = university.Phone,
                     //   Nature = university.Nature,
                     //AscriptionName = university.AscriptionName,
-                    //  Rank = university.Rank,
+                    Rank = university.Rank,
                     AreaName = university.Area_Name,
                     Logo = university.Logo,
                     //  Syl = university.Syl == 1 ? true : false,
@@ -2266,8 +2266,8 @@ namespace New_College.Services
                 list.Add(models);
 
             });
-            byte[] byresult = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(list));
+            //byte[] byresult = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(list));
-            _redisCache.Set("sync_university", byresult, TimeSpan.FromDays(1));
+            //_redisCache.Set("sync_university", byresult, TimeSpan.FromDays(1));
             return list;
         }