diff --git a/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs b/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs index 1786121..89e4c2b 100644 --- a/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs +++ b/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs @@ -45,11 +45,13 @@ public class PersonTaskApp : SqlSugarBaseApp .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 { var result = await Repository.AsQueryable() .RightJoin((a, b) => a.Id == b.TaskId) + .InnerJoin((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, // 接收时间 diff --git a/OpenAuth.App/ServiceApp/Task/Response/InsTaskExtend.cs b/OpenAuth.App/ServiceApp/Task/Response/InsTaskExtend.cs index 3620a83..a86d5db 100644 --- a/OpenAuth.App/ServiceApp/Task/Response/InsTaskExtend.cs +++ b/OpenAuth.App/ServiceApp/Task/Response/InsTaskExtend.cs @@ -42,8 +42,17 @@ public class InsTaskExtend : InsTaskgroup /// /// public List PrePhaseList { get; set; } + /// /// 后时相 /// public List NextPhaseList { get; set; } + + public int TubanNum { get; set; } + public int RowNumber { get; set; } + + /// + /// aishp名称 + /// + public string ShpName { get; set; } } \ No newline at end of file