任务详情添加aishp名称

OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs

@@ -45,11 +45,13 @@ public class PersonTaskApp : SqlSugarBaseApp<InsTask, SugarDbContext>
             .Where((a, b) => userIds.Contains(b.ReciveUserId))
             .Select((a, b) => new InsTaskExtend
             {
+                RowNumber = SqlSugar.SqlFunc.RowNumber(b.Id),
                 TaskName = a.TaskName, // 任务名称
                 GroupName = b.GroupName, // 任务分组包
                 Sort = b.Sort, // 序号
                 BeginNum = b.BeginNum,
                 EndNum = b.EndNum,
+                TubanNum = b.EndNum - b.BeginNum + 1,
                 TaskId = b.TaskId,
                 CreateTime = a.CreateTime, // 创建时间
                 ReciveTime = b.ReciveTime, // 接收时间
@@ -78,14 +80,17 @@ public class PersonTaskApp : SqlSugarBaseApp<InsTask, SugarDbContext>
     {
         var result = await Repository.AsQueryable()
             .RightJoin<InsTaskgroup>((a, b) => a.Id == b.TaskId)
+            .InnerJoin<InsAishp>((a, b, c) => a.ShpId == c.Id)
             .Where((a, b) => b.Id == taskGroupId)
-            .Select((a, b) => new InsTaskExtend
+            .Select((a, b,c) => new InsTaskExtend
             {
                 TaskName = a.TaskName, // 任务名称
                 GroupName = b.GroupName, // 任务分组包
                 Sort = b.Sort, // 序号
                 BeginNum = b.BeginNum,
+                ShpName = c.ShpName,
                 EndNum = b.EndNum,
+                TubanNum = b.EndNum - b.BeginNum + 1,
                 TaskId = b.TaskId,
                 CreateTime = a.CreateTime, // 创建时间
                 ReciveTime = b.ReciveTime, // 接收时间

OpenAuth.App/ServiceApp/Task/Response/InsTaskExtend.cs

@@ -42,8 +42,17 @@ public class InsTaskExtend : InsTaskgroup
     /// </summary>
     /// <returns></returns>
     public List<string> PrePhaseList { get; set; }
+
     /// <summary>
     /// 后时相
     /// </summary>
     public List<string> NextPhaseList { get; set; }
+
+    public int TubanNum { get; set; }
+    public int RowNumber { get; set; }
+
+    /// <summary>
+    /// aishp名称
+    /// </summary>
+    public string ShpName { get; set; }
 }