diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index a90fdde7..9714d26a 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -267,6 +267,23 @@ namespace BBWY.Server.Business .Page(request.PageIndex, request.PageSize) .Count(out long count) .ToList(); + + if (list.Count() > 0) + { + var preTaskIdList = list.Where(pt => pt.PreTaskId != null && pt.PreTaskId != -1).Select(pt => pt.PreTaskId).ToArray(); + if (preTaskIdList.Count() > 0) + { + var preTaskList = fsql.Select(preTaskIdList).ToList(pt => new { Id = pt.Id, ActivityName = pt.ActivityName }); + foreach (var preTask in preTaskList) + { + var ptTaskList = list.Where(pt => pt.PreTaskId == preTask.Id); + foreach (var ptTask in ptTaskList) + ptTask.PreTaskName = preTask.ActivityName; + } + } + } + + return new PromotionTaskResponse() { Count = count, diff --git a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs b/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs index 3e470abf..5dcaa7c4 100644 --- a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs +++ b/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs @@ -119,6 +119,11 @@ namespace BBWY.Server.Model.Dto /// public long? PreTaskId { get; set; } + /// + /// 前置任务名称 + /// + public string PreTaskName { get; set; } + /// /// 错误信息 ///