Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.StudyAbroad/StudyAbroadModule.cs

@@ -190,9 +190,12 @@ namespace Edu.Module.StudyAbroad
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        public RB_StudyAbroad_ViewModel GetStudyAbroadModule(object Id,int IsGetPrice=0)
+        public RB_StudyAbroad_ViewModel GetStudyAbroadModule(int Id,int IsGetPrice=0)
         {
-            var model= studyAbroadRepository.GetEntity<RB_StudyAbroad_ViewModel>(Id);
+            var model = studyAbroadRepository.GetStudyAbroadListExtRepository(new RB_StudyAbroad_ViewModel()
+            {
+                Id = Id
+            })?.FirstOrDefault();
             if (model != null && IsGetPrice == 1)
             {
                 model.PreferentialList = GetStudyaBroadPreferentialListModule(new RB_StudyaBroad_Preferential_ViewModel()

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -60,6 +60,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 ");
                 }
+                if (query.SaleState > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.SaleState),(int)query.SaleState);
+                }
                 return GetPage<RB_StudyAbroad_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
             }
         }
@@ -97,5 +101,59 @@ WHERE 1=1
                 return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList();
             }
         }
+
+        /// <summary>
+        /// 获取留学就业列表扩展
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_StudyAbroad_ViewModel> GetStudyAbroadListExtRepository(RB_StudyAbroad_ViewModel query)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.`Name`,'') AS SupplierName
+FROM RB_StudyAbroad AS A LEFT JOIN rb_supplier AS B ON A.SupplierId=B.Id
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_StudyAbroad_ViewModel>();
+            }
+            else
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_StudyAbroad_ViewModel.Name));
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+                if (query.Type > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.Type), query.Type);
+                }
+                if (query.AuditType == 1)
+                {
+                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorStatus=0 ");
+                }
+                else if (query.AuditType == 2)
+                {
+                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 ");
+                }
+                if (query.SaleState > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.SaleState), (int)query.SaleState);
+                }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.Id), query.Id);
+                }
+                return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList();
+            }
+        }
     }
 }

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

 using Edu.Cache.User;
 using Edu.Common.API;
+using Edu.Common.Enum.Sale;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.StudyAbroad;
 using Edu.Module.StudyAbroad;
@@ -190,6 +191,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 SupplierId = base.ParmJObj.GetInt("SupplierId"),
                 IsQPrice = base.ParmJObj.GetInt("IsQPrice"),
                 AuditType=base.ParmJObj.GetInt("AuditType"),
+                SaleState=(SaleStateEnum)base.ParmJObj.GetInt("SaleState")
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
@@ -362,6 +364,34 @@ namespace Edu.WebApi.Controllers.StudyAbroad
             {
                 extModel = new RB_StudyAbroad_ViewModel();
             }
+            var obj = new
+            {
+                extModel.Id,
+                extModel.Type,
+                extModel.Name,
+                extModel.SupplierId,
+                extModel.SupplierName,
+                extModel.SupplierContract,
+                extModel.SuggestPrice,
+                extModel.SellPrice,
+                extModel.Remark,
+                extModel.SaleState,
+                SaleStateName = Common.Plugin.EnumHelper.ToName(extModel.SaleState),
+                extModel.CreateBy,
+                CreateByName= UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? "",
+                CreateTimeStr=Common.ConvertHelper.FormatTime(extModel.CreateTime),
+                extModel.DirectorId,
+                extModel.DirectorStatus,
+                extModel.DirectorOpinion,
+                DirectorAuditTimeStr= Common.ConvertHelper.FormatTime(extModel.DirectorAuditTime),
+                DirectorName= UserReidsCache.GetUserLoginInfo(extModel.DirectorId)?.AccountName ?? "",
+                extModel.ManagerId,
+                extModel.ManagerStatus,
+                extModel.ManagerOpinion,
+                ManagerAuditTimeStr= Common.ConvertHelper.FormatTime(extModel.ManagerAuditTime),
+                ManagerName = UserReidsCache.GetUserLoginInfo(extModel.ManagerId)?.AccountName ?? "",
+                extModel.PreferentialList,
+            };
             return ApiResult.Success(data: extModel);
         }
 
@@ -447,6 +477,17 @@ namespace Edu.WebApi.Controllers.StudyAbroad
             });
             return ApiResult.Success(data: list);
         }
+
+        /// <summary>
+        /// 获取留学就业销售状态列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSaleStateList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(SaleStateEnum));
+            return ApiResult.Success(data: list);
+        }
         #endregion
     }
 }