Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/TaskController.cs

@@ -50,9 +50,10 @@ namespace OASystem.API.Controllers
                      .LeftJoin<Sys_SetData>((x, y, z) => x.ForeignOptionId == z.Id && z.IsDel == 0)
                      .LeftJoin<Sys_Users>((x, y, z, w) => x.AssignedUserId == w.Id && w.IsDel == 0)
                      .Where(expr.ToExpression());
+
             var count = query.Count();
 
-            var list = query.Select((x, y, z, w) => new
+            var temp = query.Select((x, y, z, w) => new
             {
                 Id = x.Id,
                 TaskName = x.Name,
@@ -62,7 +63,19 @@ namespace OASystem.API.Controllers
                 Team = y.TeamName,
                 Active = x.ProgressId,
                 CreateUserid = x.CreateUserId
-            }).ToPageList(dto.PageIndex, dto.PageSize);
+            });
+
+            var list = temp
+                .OrderByIF(dto.isLv == 1,
+                    x => SqlFunc.IsNull(
+                        SqlFunc.Subqueryable<Task_WorkTask>()
+                            .Where(twt => twt.IsDel == 0 && twt.IsUrgent && twt.WorkOrderId == x.Id)
+                            .Min(twt => twt.StartTime),
+                        DateTime.MaxValue  // 把 null 替换成极大值
+                    )
+                )
+                .OrderBy(x => x.StartTime)
+                .ToPageList(dto.PageIndex, dto.PageSize);
 
 
             var data = list.Select(x =>
@@ -98,7 +111,8 @@ namespace OASystem.API.Controllers
                             Name = x.Name,
                         }).ToList()
                     },
-                    isReview = x.CreateUserid == dto.UserId
+                    isReview = x.CreateUserid == dto.UserId,
+                    UrgentCount = taskArr.Where(x => x.IsUrgent).Count()
                 };
 
             }).ToList();

OASystem/OASystem.Domain/Dtos/Task/GetTaskDefaultDto.cs

@@ -23,6 +23,8 @@ namespace OASystem.Domain.Dtos.Task
         public string Seach_StartTime { get; set; }
 
         public string Seach_EndTime { get; set; }
+
+        public int isLv { get; set; } = 0;
     }
 
     public class TaskOperationDto
@@ -142,6 +144,8 @@ namespace OASystem.Domain.Dtos.Task
         public StepInfo StepInfo { get; set; }
 
         public bool isReview { get; set; }
+
+        public int UrgentCount { get; set; }
     }
 
     public class StepInfo