部门超期明细

src/Hotline.Api/Controllers/OrderController.cs

@@ -3651,7 +3651,8 @@ public class OrderController : BaseController
              .WhereIF(dto.AuditState == 1, d => d.State == ESendBackAuditState.Apply)
              .WhereIF(dto.AuditState == 2 && !dto.State.HasValue, d => d.State > ESendBackAuditState.Apply)
              .WhereIF(dto.AuditState == 2 && dto.State.HasValue, d => d.State == dto.State)
-             .WhereIF(_sessionContext.Roles.Contains("role_sysadmin") == false, x => x.SendBackOrgId == _sessionContext.OrgId);// 123 系统管理员
+             //.WhereIF(dto.AuditState == 3 && _sessionContext.RequiredOrgId != OrgSeedData.CenterId, x=>x.SendBackOrgId.StartsWith(_sessionContext.OrgId))
+             .WhereIF(_sessionContext.Roles.Contains("role_sysadmin") == false && dto.AuditState != 3,x => x.SendBackOrgId == _sessionContext.OrgId);// 123 系统管理员
 
         var (total, items) = await query.OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);

src/Hotline.Application/Orders/OrderApplication.cs

@@ -677,15 +677,18 @@ public class OrderApplication : IOrderApplication, IScopeDependency
 			.InnerJoin<SystemOrganize>((x, so) => x.ActualHandleOrgCode == so.Id)
 			.Where(x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
             .WhereIF(dto.Statuses.Any(), x => dto.Statuses.Contains(x.Status))  //工单状态
+            .WhereIF( dto.ExpiredType is  2, x=>x.OrderDelays.Any(x=>  x.DelayState == EDelayState.Pass))
             .Where(x =>
 				(x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.FiledTime) || (x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()))
-			.WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && IsCenter == false, x => x.ActualHandleOrgCode.StartsWith(dto.OrgCode))
+            .WhereIF(IsCenter == false, x => x.ActualHandleOrgCode.StartsWith(_sessionContext.RequiredOrgId))
+			.WhereIF(!string.IsNullOrEmpty(dto.OrgName)  , x => x.AcceptorOrgName == dto.OrgName)
 			.MergeTable();
 
         var queryCountersign = _workflowCountersignRepository.Queryable()
             .LeftJoin<WorkflowCountersignMember>((x, o) => x.Id == o.WorkflowCountersignId)
             .Where((x, o) => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime && x.IsExpired.HasValue && x.IsExpired.Value == true)
-            .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && IsCenter == false, (x, o) => o.Key.StartsWith(dto.OrgCode))
+            .WhereIF(IsCenter == false, (x, o) => o.Key.StartsWith(_sessionContext.RequiredOrgId))
+			.WhereIF(!string.IsNullOrEmpty(dto.OrgName) && IsCenter == false, (x, o) => o.Value == dto.OrgName)
             .Select((x, o) => new { Id = x.WorkflowId, ActualHandleOrgCode = o.Key, ActualHandleOrgName = o.Value })
             .MergeTable();
 

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -99,7 +99,7 @@ public record OrgDataListAllDetailRequest : PagedRequest
 	/// <summary>
 	/// 部门Code
 	/// </summary>
-	public string OrgCode { get; set; }
+	public string OrgName { get; set; }
 
 	/// <summary>
 	/// 工单编号