From b5f8bf77d552eead33c3d74af830774e2ce7f380 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 8 Feb 2023 03:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=90=8C=E6=97=B6=E8=BF=94=E5=9B=9E=E5=89=8D=E7=BD=AE?=
 =?UTF-8?q?Id=E5=92=8C=E5=89=8D=E7=BD=AE=E4=BB=BB=E5=8A=A1=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EvaluationAssistantBusiness.cs              | 17 +++++++++++++++++
 .../PromotionTask/PromotionTaskResponse.cs      |  5 +++++
 2 files changed, 22 insertions(+)

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<PromotionTaskItemResponse>();
+
+            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<PromotionTask>(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
         /// </summary>
         public long? PreTaskId { get; set; }
 
+        /// <summary>
+        /// 前置任务名称
+        /// </summary>
+        public string PreTaskName { get; set; }
+
         /// <summary>
         /// 错误信息
         /// </summary>