额外任务处理

OASystem/OASystem.Api/Controllers/TaskController.cs

@@ -339,6 +339,11 @@ namespace OASystem.API.Controllers
             users.Insert(0, new { Id = 0, CnName = "未选择" });
 
             var workOrder = _sqlsugar.Queryable<Task_WorkOrder>().First(x => x.Id == dto.Id && x.IsDel == 0);
+            var tasks = _sqlsugar.Queryable<Task_WorkTask>()
+                                    .Where(x => x.IsDel == 0 && x.WorkOrderId == workOrder.Id)
+                                    .OrderBy(x => x.Sort)
+                                    .Select<WorkTaskView>()
+                                    .ToList();
 
             var data = new
             {
@@ -357,11 +362,8 @@ namespace OASystem.API.Controllers
                     workOrder.StartTime,
                     Action = workOrder.ProgressId
                 },
-                workTask = _sqlsugar.Queryable<Task_WorkTask>()
-                                    .Where(x => x.IsDel == 0 && x.WorkOrderId == workOrder.Id)
-                                    .OrderBy(x => x.Sort)
-                                    .Select<WorkTaskView>()
-                                    .ToList()
+                mainTask = tasks.Where(x => x.IsExtraTask == false).ToList(),
+                extraTask = tasks.Where(x => x.IsExtraTask == true).ToList()
             };
             jw.Data = data;
             jw.Code = 200;