bug list fixed

New_College.Api/Controllers/Front/PcVolunteerController.cs

@@ -58,7 +58,7 @@ namespace New_College.Api.Controllers.Front
                     .And(c => c.IsDelete == false)
                     .And(c => c.CustomerId == view.CustomerId)
                     .ToExpression();
-            var pagemodel = await _VolunteerTableServices.QueryPage(exp, view.PageIndex, view.PageSize);
+            var pagemodel = await _VolunteerTableServices.QueryPage(exp, view.PageIndex, view.PageSize, "  CreateTime  desc");
             response.data = pagemodel.data.Select(c => new VolunteerTableDtoView()
             {
                 CustomerId = c.CustomerId,

New_College.Api/Controllers/Front/VolunteerController.cs

@@ -270,5 +270,23 @@ namespace New_College.Api.Controllers.Front
         {
             return await t_EnrollmentPlanedescServices.GetBatchByYearArea(query);
         }
+
+
+
+        /// <summary>
+        ///获取批次(院校详情中调用)
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<List<IdNameResult>>> GetUniversityPlanBatch([FromQuery] YearAreaQuery query)
+        {
+            return await t_EnrollmentPlanedescServices.GetUniversityPlanBatch(query);
+        }
+
+
+
+     
+
     }
 }

New_College.Api/New_College.Model.xml

@@ -1216,6 +1216,11 @@
             排名
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.D_UniversityRank.Score">
+            <summary>
+            分数(没有就是--)
+            </summary>
+        </member>
         <member name="T:New_College.Model.Models.FeedbackInfo">
             <summary>
             

New_College.Api/New_College.xml

@@ -916,6 +916,13 @@
             <param name="query"></param>
             <returns></returns>
         </member>
+        <member name="M:New_College.Api.Controllers.Front.VolunteerController.GetUniversityPlanBatch(New_College.Model.ViewModels.YearAreaQuery)">
+             <summary>
+            获取批次(院校详情中调用)
+             </summary>
+             <param name="query"></param>
+             <returns></returns>
+        </member>
         <member name="M:New_College.Api.Controllers.Front.WeixinPayController.UnifiedOrder(New_College.Model.ViewModels.UnifiedOrderQuery)">
             <summary>
             下订单

New_College.IServices/IT_EnrollmentPlanedescServices.cs

@@ -133,6 +133,14 @@ namespace New_College.IServices
         /// <returns></returns>
         Task<MessageModel<List<IdNameResult>>> GetBatchByYearArea(YearAreaQuery query);
 
+        /// <summary>
+        /// 获取批次(院校详情中接口)
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        Task<MessageModel<List<IdNameResult>>> GetUniversityPlanBatch(YearAreaQuery query);
+
+
 
 
 

New_College.Model/ViewModels/UniversityPlanProView.cs

@@ -13,6 +13,8 @@ namespace New_College.Model.ViewModels
 
         public string Location { get; set; }
 
+        public string BatchName { get; set; }
+
         public int Year { get; set; }
 
     }

New_College.Repository/BASE/D_PlanMajorDescProRepository.cs

@@ -48,7 +48,9 @@ namespace New_College.Repository
                c._SYL,
                c.SchoolType,
                c.EducationCategory,
-               c.Rank
+               c.Rank,
+               c.Logo,
+               c.Web
 
            })
             .Select(c => new UniversityPlanProView()

New_College.Services/D_PlanMajorDescProServices.cs

@@ -41,6 +41,7 @@ namespace New_College.Services
             Expression<Func<D_PlanMajorDescPro, bool>> expression = Expressionable.Create<D_PlanMajorDescPro>()
                 .And(c => c.UId == request.UId)
                 .And(c => c.Location == request.Location)
+                .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
                 .And(c => c.Years == request.Year)
              .ToExpression();
             var query = await _dal.Query(expression);

New_College.Services/T_EnrollmentPlanedescServices.cs

@@ -43,6 +43,7 @@ namespace New_College.Services
         private readonly ID_PlanMajorScoreLineRepository _PlanMajorScoreLineRepository;
         private readonly ID_QualificationLineRepository _QualificationLineRepository;
         private readonly ID_ScoreLineRepository _ScoreLineRepository;
+        private readonly IT_BatchlineRepository t_BatchlineRepository;
         public T_EnrollmentPlanedescServices(IBaseRepository<T_EnrollmentPlanedesc> dal
             , ID_UniversityRepository ID_UniversityRepository
             , IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository
@@ -59,7 +60,7 @@ namespace New_College.Services
             , ID_UniversityCollectionRepository ID_UniversityCollectionRepository
             , IT_GearInfoRepository IT_GearInfoRepository, IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescServices,
             IV_CustomerInfoRepository v_CustomerInfoRepository, ID_PlanMajorDescRepository planMajorDescRepository,
-            ID_PlanMajorScoreLineRepository planMajorScoreLineRepository, ID_QualificationLineRepository qualificationLineRepository, ID_ScoreLineRepository scoreLineRepository)
+            ID_PlanMajorScoreLineRepository planMajorScoreLineRepository, ID_QualificationLineRepository qualificationLineRepository, ID_ScoreLineRepository scoreLineRepository, IT_BatchlineRepository batchlineRepository)
         {
             this._dal = dal;
             d_UniversityRepository = ID_UniversityRepository;
@@ -82,6 +83,7 @@ namespace New_College.Services
             _PlanMajorScoreLineRepository = planMajorScoreLineRepository;
             _QualificationLineRepository = qualificationLineRepository;
             _ScoreLineRepository = scoreLineRepository;
+            t_BatchlineRepository = batchlineRepository;
         }
 
         public List<string> permut = new List<string>();
@@ -1511,6 +1513,59 @@ namespace New_College.Services
             return returnclaim;
         }
 
+
+
+        /// <summary>
+        /// 院校内部获取批次
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public async Task<MessageModel<List<IdNameResult>>> GetUniversityPlanBatch(YearAreaQuery query)
+        {
+
+            query.Year = query.Year.HasValue && query.Year > 2023 ? 2023 : query.Year;
+            Expression<Func<T_Batchline, bool>> expression = Expressionable.Create<T_Batchline>()
+             .And(c => c.IsDelete == false)
+             .And(c => c.AreaName == query.AreaName)
+             .AndIF(query.Year.HasValue, c => c.Year == query.Year)
+             .ToExpression();
+            var info = await t_BatchlineRepository.Query(expression);
+            if (info.Count <= 0)
+                return new MessageModel<List<IdNameResult>>() { success = false, msg = "数据为空" };
+            List<IdNameResult> list = new List<IdNameResult>() { };
+            foreach (var item in info)
+            {
+                if (item.Type_name != "不分文理")
+                {
+                    list.Add(new IdNameResult()
+                    {
+                        Id = item.Id,
+                        Name = item.Batch_name,
+                        TypeName = item.Type_name,
+                        Year = item.Year,
+                        Score = item.Average
+                    });
+                }
+                else
+                {
+                    list.Add(new IdNameResult()
+                    {
+                        Id = item.Id,
+                        Name = item.Batch_name,
+                        Year = item.Year,
+                        Score = item.Average
+                    });
+                }
+            }
+            return new MessageModel<List<IdNameResult>>()
+            {
+                success = true,
+                msg = "获取成功",
+                response = list
+            };
+
+        }
+
         /// <summary>
         /// 获取批次
         /// </summary>
@@ -1521,7 +1576,7 @@ namespace New_College.Services
             query.Year = query.Year.HasValue && query.Year > 2023 ? 2023 : query.Year;
             Expression<Func<T_EnrollmentBatch, bool>> expression = Expressionable.Create<T_EnrollmentBatch>()
              .And(c => c.IsDelete == false)
-             .And(c=>!c.Batch_name.Contains("提前"))
+             .And(c => !c.Batch_name.Contains("提前"))
              .And(c => !c.Batch_name.Contains("零志愿"))
              .And(c => c.AreaName == query.AreaName)
              .AndIF(query.Year.HasValue, c => c.Year == query.Year)