接口修改

Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs

@@ -64,5 +64,10 @@ namespace Edu.Model.ViewModel.StudyAbroad
         /// 供应商上传合同
         /// </summary>
         public string ContractUrl { get; set; }
+
+        /// <summary>
+        /// 留学就业编号查询使用
+        /// </summary>
+        public string QIds { get; set; }
     }
 }

Edu.Module.Course/CourseOfferModule.cs

@@ -4,6 +4,7 @@ using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
 using Edu.Repository.Course;
 using Edu.Repository.Log;
+using Edu.Repository.StudyAbroad;
 using Edu.Repository.User;
 using System;
 using System.Collections.Generic;
@@ -48,6 +49,16 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly CourseModule courseModule = new CourseModule();
 
+        /// <summary>
+        /// 留学就业仓储层对象
+        /// </summary>
+        private readonly RB_StudyAbroadRepository studyAbroadRepository = new RB_StudyAbroadRepository();
+
+        /// <summary>
+        /// 留学就业价格仓储层对象
+        /// </summary>
+        private readonly RB_StudyaBroad_PreferentialRepository studyaBroad_PreferentialRepository = new RB_StudyaBroad_PreferentialRepository();
+
         /// <summary>
         /// 获取报价单分页列表
         /// </summary>
@@ -61,11 +72,12 @@ namespace Edu.Module.Course
             var list= course_OfferRepository.GetCourseOfferPageRepository(pageIndex, pageSize, out rowsCount, query);
             if (query.IsGetDetails == 1 && list != null && list.Count > 0)
             {
-                string ids = string.Join(",", list.Select(qitem => qitem.Id));
+                //报价单编号
+                string offids = string.Join(",", list.Select(qitem => qitem.Id));
                 var detailsList = new List<RB_Course_OfferDetails_ViewModel>();
-                if (!string.IsNullOrEmpty(ids))
+                if (!string.IsNullOrEmpty(offids))
                 {
-                    detailsList = GetCourseOfferDetailsListModule(new RB_Course_OfferDetails_ViewModel() { QOfferIds = ids });
+                      detailsList = GetCourseOfferDetailsListModule(new RB_Course_OfferDetails_ViewModel() { QOfferIds = offids });
                 }
                 foreach (var item in list)
                 {
@@ -222,18 +234,45 @@ namespace Edu.Module.Course
                 {
                     string ids = string.Join(",", model.OfferDetails.Select(qitem => qitem.CourseId));
                     List<RB_Course_ViewModel> courseList = new List<RB_Course_ViewModel>();
-                    if (!string.IsNullOrEmpty(ids))
+                    if (model.OfferType == OfferTypeEnum.Course)
                     {
-                        courseList= courseModule.GetCourseListModule(new RB_Course_ViewModel()
+                        if (!string.IsNullOrEmpty(ids))
                         {
-                            IsQPrice = 1,
-                            QCourseIds = ids,
-                            Group_Id=model.Group_Id,
-                        });
+                            courseList = courseModule.GetCourseListModule(new RB_Course_ViewModel()
+                            {
+                                IsQPrice = 1,
+                                QCourseIds = ids,
+                                Group_Id = model.Group_Id,
+                            });
+                        }
+                        foreach (var item in model.OfferDetails)
+                        {
+                            item.SourceData = courseList?.Where(qitem => qitem.CourseId == item.CourseId)?.FirstOrDefault() ?? new RB_Course_ViewModel();
+                        }
                     }
-                    foreach (var item in model.OfferDetails)
+                    else
                     {
-                        item.SourceData = courseList?.Where(qitem => qitem.CourseId == item.CourseId)?.FirstOrDefault() ?? new RB_Course_ViewModel();
+                        var studyList = studyAbroadRepository.GetStudyAbroadListRepository(new Model.ViewModel.StudyAbroad.RB_StudyAbroad_ViewModel()
+                        {
+                            QIds = ids
+                        });
+                        if (studyList != null && studyList.Count > 0)
+                        {
+                            string studyIds = string.Join(",", studyList.Select(qitem => qitem.Id));
+                            var detailsList = studyaBroad_PreferentialRepository.GetStudyaBroadPreferentialListRepostory(new Model.ViewModel.StudyAbroad.RB_StudyaBroad_Preferential_ViewModel()
+                            {
+                                QStudyabroadIds = studyIds
+                            });
+
+                            foreach (var item in studyList)
+                            {
+                                item.PreferentialList = detailsList?.Where(qitem => qitem.StudyabroadId == item.Id)?.ToList() ?? new List<Model.ViewModel.StudyAbroad.RB_StudyaBroad_Preferential_ViewModel>();
+                            }
+                        }
+                        foreach (var item in model.OfferDetails)
+                        {
+                            item.SourceData = studyList?.Where(qitem => qitem.Id == item.CourseId)?.FirstOrDefault() ?? new Model.ViewModel.StudyAbroad.RB_StudyAbroad_ViewModel();
+                        }
                     }
                 }
             }

Edu.Repository/Course/RB_Course_OfferDetailsRepository.cs

@@ -23,8 +23,16 @@ namespace Edu.Repository.Course
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" 
-SELECT A.*,IFNULL(B.CourseName,'') AS CourseName,IFNULL(B.SellPrice,0) AS SellPrice
-FROM RB_Course_OfferDetails AS A LEFT JOIN rb_course AS B ON A.CourseId=B.CourseId
+SELECT * FROM
+(
+		SELECT A.*,IFNULL(C.CourseName,'') AS CourseName,IFNULL(C.SellPrice,0) AS SellPrice
+		FROM RB_Course_OfferDetails AS A INNER JOIN rb_course_offer AS B ON A.OfferId=B.Id  
+				 INNER JOIN rb_course AS C ON (A.CourseId=C.CourseId AND B.OfferType=1 )
+		UNION ALL 
+		SELECT A.*,IFNULL(C.`Name`,'') AS CourseName,IFNULL(C.SellPrice,0) AS SellPrice
+		FROM RB_Course_OfferDetails AS A INNER JOIN rb_course_offer AS B ON A.OfferId=B.Id  
+				 INNER JOIN rb_studyabroad AS C ON (A.CourseId=C.Id AND B.OfferType<>1) 
+) AS A
 WHERE 1=1
 ");   
             if (query == null)
@@ -33,10 +41,6 @@ WHERE 1=1
             }
             else
             {
-                if (query.CourseId > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_OfferDetails_ViewModel.CourseId), query.CourseId);
-                }
                 if (query.OfferId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_OfferDetails_ViewModel.OfferId), query.OfferId);

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -118,6 +118,7 @@ WHERE 1=1
                                                   OR (A.DirectorStatus>0 AND A.DirectorId={0})
                                                  )", query.AuditManId);
                 }
+               
                 return GetPage<RB_StudyAbroad_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
             }
         }
@@ -152,6 +153,14 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_StudyAbroad_ViewModel.Name));
                     parameters.Add("Name", "%" + query.Name.Trim() + "%");
                 }
+                if (query.SaleState > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.SaleState), (int)query.SaleState);
+                }
+                if (!string.IsNullOrEmpty(query.QIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_StudyAbroad_ViewModel.Id), query.QIds);
+                }
                 return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList();
             }
         }

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -361,7 +361,8 @@ namespace Edu.WebApi.Controllers.StudyAbroad
             {
                 Name = base.ParmJObj.GetStringValue("Name"),
                 Type = base.ParmJObj.GetInt("Type"),
-                IsQPrice = base.ParmJObj.GetInt("IsQPrice")
+                IsQPrice = base.ParmJObj.GetInt("IsQPrice"),
+                SaleState=(SaleStateEnum)base.ParmJObj.GetInt("SaleState"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             query.School_Id = base.UserInfo.School_Id;