Commit 334e1e57 authored by liudong1993's avatar liudong1993

1

parent bcda054a
...@@ -47,5 +47,14 @@ namespace Mall.Model.Extend.Miai ...@@ -47,5 +47,14 @@ namespace Mall.Model.Extend.Miai
/// 活动ids /// 活动ids
/// </summary> /// </summary>
public string ActivityIds { get; set; } public string ActivityIds { get; set; }
/// <summary>
/// 版块名称
/// </summary>
public string ForumName { get; set; }
/// <summary>
/// 版块图标
/// </summary>
public string ForumIcon { get; set; }
} }
} }
...@@ -13,7 +13,10 @@ namespace Mall.Model.Extend.Miai ...@@ -13,7 +13,10 @@ namespace Mall.Model.Extend.Miai
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Miai_Forum_Extend : RB_Miai_Forum public class RB_Miai_Forum_Extend : RB_Miai_Forum
{ {
/// <summary>
/// 版块 ids
/// </summary>
public string ForumIds { get; set; }
} }
} }
...@@ -150,6 +150,9 @@ namespace Mall.Module.Miai ...@@ -150,6 +150,9 @@ namespace Mall.Module.Miai
var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(ActivityIds); var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(ActivityIds);
//查询活动报名数量 //查询活动报名数量
var elist = miai_ActivityEnrollRepository.GetActivityEnrollNumList(ActivityIds); var elist = miai_ActivityEnrollRepository.GetActivityEnrollNumList(ActivityIds);
//查询版本信息
string ForumIds = string.Join(",", list.Select(x => x.ForumId).Distinct());
var flist = miai_ForumRepository.GetList(new RB_Miai_Forum_Extend() { ForumIds = ForumIds });
foreach (var item in list) foreach (var item in list)
{ {
item.ImageList = new List<string>(); item.ImageList = new List<string>();
...@@ -159,6 +162,9 @@ namespace Mall.Module.Miai ...@@ -159,6 +162,9 @@ namespace Mall.Module.Miai
} }
item.ReplyNum = rlist.Where(x => x.ActivityId == item.Id).FirstOrDefault()?.ReplyNum ?? 0; item.ReplyNum = rlist.Where(x => x.ActivityId == item.Id).FirstOrDefault()?.ReplyNum ?? 0;
item.EnrollNum = elist.Where(x => x.ActivityId == item.Id).FirstOrDefault()?.Number ?? 0; item.EnrollNum = elist.Where(x => x.ActivityId == item.Id).FirstOrDefault()?.Number ?? 0;
var fmodel = flist.Where(x => x.Id == item.ForumId).FirstOrDefault();
item.ForumName = fmodel?.Name ?? "";
item.ForumIcon = fmodel?.Icon ?? "";
} }
} }
return list; return list;
......
...@@ -91,6 +91,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -91,6 +91,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.ReplyNum, x.ReplyNum,
x.EnrollNum, x.EnrollNum,
x.IsOpenEnroll, x.IsOpenEnroll,
x.ForumId,
x.ForumName,
x.ForumIcon,
Deadline =x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") :"", Deadline =x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") :"",
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss") CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
}); });
......
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