Skip to content

E
Education
Commit d4ffc955 authored by 黄奎's avatar 黄奎
Browse files
Options

留学就业产品查询修改

parent 52c2be33
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 15 deletions
Edu.Module.StudyAbroad/StudyAbroadModule.cs
View file @ d4ffc955
...@@ -61,7 +61,7 @@ namespace Edu.Module.StudyAbroad ...@@ -61,7 +61,7 @@ namespace Edu.Module.StudyAbroad
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
string ids = string.Join(",", list.Select(qitem => qitem.Id)); string ids = string.Join(",", list.Select(qitem => qitem.Id));
string countryIds = string.Join(",", list.Where(qitem=>!string.IsNullOrEmpty(qitem.TypeCountryId)).Select(qitem => qitem.TypeCountryId)); string countryIds = string.Join(",", list.Where(qitem=>!string.IsNullOrEmpty(qitem.TypeCountryId)).Select(qitem => qitem.TypeCountryId).Distinct());
List<RB_StudyaBroad_Preferential_ViewModel> preferentialList = new List<RB_StudyaBroad_Preferential_ViewModel>(); List<RB_StudyaBroad_Preferential_ViewModel> preferentialList = new List<RB_StudyaBroad_Preferential_ViewModel>();
if (query.IsQPrice == 1) if (query.IsQPrice == 1)
{ {
......
Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs
View file @ d4ffc955
...@@ -202,8 +202,12 @@ namespace Edu.WebApi.Controllers.StudyAbroad ...@@ -202,8 +202,12 @@ namespace Edu.WebApi.Controllers.StudyAbroad
[HttpPost] [HttpPost]
public ApiResult GetProductTypeList() public ApiResult GetProductTypeList()
{ {
var list = Common.Plugin.EnumHelper.EnumToList(typeof(StudyAbroadProductTypeEnum)); var query = new RB_Studyabroad_Type_Extend()
return ApiResult.Success(data: list); {
Group_Id = base.UserInfo.Group_Id
};
var list = studyAbroadModule.GetStudyabroadTypeListModule(query);
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.Name }));
} }
/// <summary> /// <summary>
...@@ -231,22 +235,22 @@ namespace Edu.WebApi.Controllers.StudyAbroad ...@@ -231,22 +235,22 @@ namespace Edu.WebApi.Controllers.StudyAbroad
var list = studyAbroadModule.GetStudyAbroadPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = studyAbroadModule.GetStudyAbroadPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) foreach (var item in list)
{ {
if (item.CreateBy > 0) //if (item.CreateBy > 0)
{ //{
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? ""; // item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
} //}
if (item.UpdateBy > 0) if (item.UpdateBy > 0)
{ {
item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? ""; item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "";
} }
if (item.DirectorId > 0) //if (item.DirectorId > 0)
{ //{
item.DirectorName = UserReidsCache.GetUserLoginInfo(item.DirectorId)?.AccountName ?? ""; // item.DirectorName = UserReidsCache.GetUserLoginInfo(item.DirectorId)?.AccountName ?? "";
} //}
if (item.ManagerId > 0) //if (item.ManagerId > 0)
{ //{
item.ManagerName = UserReidsCache.GetUserLoginInfo(item.ManagerId)?.AccountName ?? ""; // item.ManagerName = UserReidsCache.GetUserLoginInfo(item.ManagerId)?.AccountName ?? "";
} //}
result.Add(new result.Add(new
{ {
item.Id, item.Id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment