页面修改

Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs

@@ -84,5 +84,10 @@ namespace Edu.Model.ViewModel.StudyAbroad
         /// 结束时间
         /// </summary>
         public string EndTime { get; set; }
+
+        /// <summary>
+        /// 留学国家名称
+        /// </summary>
+        public string StudyCountryName { get; set; }
     }
 }

Edu.Module.StudyAbroad/StudyAbroadModule.cs

@@ -3,9 +3,11 @@ using Edu.Common.Enum.Sale;
 using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.Sell;
 using Edu.Model.ViewModel.StudyAbroad;
+using Edu.Model.ViewModel.System;
 using Edu.Repository.Course;
 using Edu.Repository.Sell;
 using Edu.Repository.StudyAbroad;
+using Edu.Repository.System;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34,6 +36,11 @@ namespace Edu.Module.StudyAbroad
         /// </summary>
         private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
 
+        /// <summary>
+        /// 地区仓储层对象
+        /// </summary>
+        private readonly RB_DestinationRepository destinationRepository = new RB_DestinationRepository();
+
         /// <summary>
         /// 获取留学就业分页列表
         /// </summary>
@@ -48,6 +55,7 @@ namespace Edu.Module.StudyAbroad
             if (list != null && list.Count > 0)
             {
                 string ids = string.Join(",", list.Select(qitem => qitem.Id));
+                string countryIds = string.Join(",", list.Select(qitem => qitem.StudyCountryId));
                 List<RB_StudyaBroad_Preferential_ViewModel> preferentialList = new List<RB_StudyaBroad_Preferential_ViewModel>();
                 if (query.IsQPrice == 1)
                 {
@@ -56,8 +64,18 @@ namespace Edu.Module.StudyAbroad
                         QStudyabroadIds = ids
                     });
                 }
+                List<RB_Destination_ViewModel> areaList = new List<RB_Destination_ViewModel>();
+                if (!string.IsNullOrEmpty(countryIds))
+                {
+                    areaList= destinationRepository.GetDestinationListRepository(new RB_Destination_ViewModel()
+                    {
+                        Ids = countryIds
+                    });
+                }
+                
                 foreach (var item in list)
                 {
+                    item.StudyCountryName = areaList?.Where(qitem => qitem.ID == item.StudyCountryId)?.FirstOrDefault()?.Name ?? "";
                     item.PreferentialList = preferentialList?.Where(qitem => qitem.StudyabroadId == item.Id)?.ToList() ?? new List<RB_StudyaBroad_Preferential_ViewModel>();
                 }
             }

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -280,7 +280,8 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                     item.ProductType,
                     ProductTypeName=item.ProductType.ToName(),
                     item.StudyFeature,
-                    item.StudyCountryId
+                    item.StudyCountryId,
+                    item.StudyCountryName,
                 });
             }
             pageModel.Count = rowsCount;