Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -155,6 +155,7 @@ public class OrderController : BaseController
     private readonly IOrderSnapshotApplication _orderSnapshotApplication;
     private readonly IIndustryRepository _industryRepository;
     private readonly IRepository<SystemDicData> _sysDicDataRepository;
+    private readonly IRepository<SystemOrganize> _systemOrganizeRepository;
 
     public OrderController(
         IOrderDomainService orderDomainService,
@@ -226,7 +227,8 @@ public class OrderController : BaseController
         IOrderSnapshotRepository orderSnapshotRepository,
         IIndustryRepository industryRepository,
         IOrderSnapshotApplication orderSnapshotApplication,
-        IRepository<SystemDicData> sysDicDataRepository)
+        IRepository<SystemDicData> sysDicDataRepository,
+        IRepository<SystemOrganize> systemOrganizeRepository)
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;
@@ -298,6 +300,7 @@ public class OrderController : BaseController
         _industryRepository = industryRepository;
         _orderSnapshotApplication = orderSnapshotApplication;
         _sysDicDataRepository = sysDicDataRepository;
+        _systemOrganizeRepository = systemOrganizeRepository;
     }
 
     #endregion
@@ -3128,6 +3131,38 @@ public class OrderController : BaseController
 
     #region 工单催办
 
+    /// <summary>
+    /// 工单催办列表
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpGet("waiturge")]
+    public async Task<PagedDto<UrgeOrderDto>> WaitUrgeList([FromQuery] UrgeListDto dto)
+    {
+        //如果角色为空，则说明催办的是部门，根据部门查询
+        //如果角色不为空，则说明催办的是角色，则根据部门和角色一起查
+        var (total, items) = await _orderUrgeRepository.Queryable()
+            .Includes(x => x.Order)
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
+                d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
+            .WhereIF(dto.UrgeState > -1, d => d.State == dto.UrgeState)
+            .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
+            .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
+            .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneName), d => d.Order.OrgLevelOneName.Contains(dto.OrgLevelOneName)) //一级部门
+            .WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.Order.ActualHandleOrgName.Contains(dto.ActualHandleOrgName)) //接办部门（综合查询模糊）
+            .WhereIF(!string.IsNullOrEmpty(dto.CurrentStepCode), d => d.Order.CurrentStepCode == dto.CurrentStepCode) //当前办理节点
+               .WhereIF(_sessionContext.OrgIsCenter == false, d =>
+               (SqlFunc.IsNullOrEmpty(d.RoleId) && d.OrderId.StartsWith(_sessionContext.RequiredOrgId)) ||
+               (SqlFunc.IsNullOrEmpty(d.RoleId) == false && d.OrderId.StartsWith(_sessionContext.RequiredOrgId)) && _sessionContext.Roles.Contains(d.RoleId)
+               )
+
+            //   .WhereIF(_sessionContext.RequiredOrgId!="001", x => x.OrgId == _sessionContext.OrgId)
+            .OrderByDescending(x => x.CreationTime)
+            .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+
+        return new PagedDto<UrgeOrderDto>(total, _mapper.Map<IReadOnlyList<UrgeOrderDto>>(items));
+    }
+
     /// <summary>
     /// 工单催办列表
     /// </summary>
@@ -3143,7 +3178,7 @@ public class OrderController : BaseController
             .WhereIF(dto.UrgeState > -1, x => x.State == dto.UrgeState)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
-            .Where(x => x.OrgId == _sessionContext.OrgId)
+            .WhereIF(_sessionContext.OrgIsCenter == false, x => x.OrgId.StartsWith(_sessionContext.OrgId))
             .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
@@ -3173,50 +3208,65 @@ public class OrderController : BaseController
             var order = await _orderRepository.GetAsync(item, HttpContext.RequestAborted);
             if (order != null)
             {
-                var model = new OrderUrge
-                {
-                    OrderId = order.Id,
-                    OrgId = order.CurrentHandleOrgId,
-                    OrgName = order.CurrentHandleOrgName,
-                    CreatorOrgName = _sessionContext.OrgName,
-                    CrUser = _sessionContext.UserName,
-                    State = 0,
-                    ApplyContent = dto.UrgeContent
-                };
-                model.InitId();
-                await _orderUrgeRepository.AddAsync(model, HttpContext.RequestAborted);
-                if (dto.AcceptSms)
+                var work = await _workflowStepRepository.GetAsync(p => p.Id == order.ActualHandleStepId, HttpContext.RequestAborted);
+                if (work != null)
                 {
-                    try
+                    var workflowStepHandler = work.GetWorkflowStepHandler();
+
+                    var model = new OrderUrge
+                    {
+                        OrderId = order.Id,
+                        OrgId = workflowStepHandler.OrgId,
+                        OrgName = workflowStepHandler.OrgName,
+                        RoleId = workflowStepHandler.RoleId,
+                        ActualHandleStepId = work.Id,
+                        CreatorOrgName = _sessionContext.OrgName,
+                        CrUser = _sessionContext.UserName,
+                        State = 0,
+                        ApplyContent = dto.UrgeContent
+                    };
+                    model.InitId();
+                    //泸州任务 303 当前节点处于承办部门，不管是几级部门，催办对象都是当前接办部门所属的一级部门的所有部门经办人
+                    if (_appOptions.Value.IsLuZhou && !string.IsNullOrEmpty(order.OrgLevelOneCode) && order.OrgLevelOneCode != "001")
+                    {
+                        model.OrgId = order.OrgLevelOneCode;
+                        model.OrgName = order.OrgLevelOneName;
+                    }
+                    await _orderUrgeRepository.AddAsync(model, HttpContext.RequestAborted);
+                    if (dto.AcceptSms)
                     {
-                        var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
-                        //查询部门所有账号
-                        var userlist = await _userRepository.Queryable().Where(x =>
-                            x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo) &&
-                            x.Roles.Any(d => acceptSmsRoleIds.Contains(d.Id))).ToListAsync();
-                        foreach (var user in userlist)
+                        try
                         {
-                            //发送短信
-                            var messageDto = new Share.Dtos.Push.MessageDto
+                            var acceptSmsRoleIds = _systemSettingCacheManager.GetSetting(SettingConstants.AcceptSmsRoleIds)?.SettingValue;
+                            //查询部门所有账号
+                            var userlist = await _userRepository.Queryable().Where(x =>
+                                x.OrgId == model.OrgId && !string.IsNullOrEmpty(x.PhoneNo) &&
+                                x.Roles.Any(d => acceptSmsRoleIds.Contains(d.Id))).ToListAsync();
+                            foreach (var user in userlist)
                             {
-                                PushBusiness = EPushBusiness.OrderUrge,
-                                ExternalId = order.Id,
-                                OrderId = order.Id,
-                                PushPlatform = EPushPlatform.Sms,
-                                Remark = order.Title,
-                                Name = user.Name,
-                                TemplateCode = "1002",
-                                Params = new List<string>() { order.No },
-                                TelNumber = user.PhoneNo,
-                            };
-                            await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);
+                                //发送短信
+                                var messageDto = new Share.Dtos.Push.MessageDto
+                                {
+                                    PushBusiness = EPushBusiness.OrderUrge,
+                                    ExternalId = order.Id,
+                                    OrderId = order.Id,
+                                    PushPlatform = EPushPlatform.Sms,
+                                    Remark = order.Title,
+                                    Name = user.Name,
+                                    TemplateCode = "1002",
+                                    Params = new List<string>() { order.No },
+                                    TelNumber = user.PhoneNo,
+                                };
+                                await _mediator.Publish(new PushMessageNotify(messageDto), HttpContext.RequestAborted);
+                            }
+                        }
+                        catch
+                        {
                         }
-                    }
-                    catch
-                    {
                     }
                 }
 
+
             }
         }
     }

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -75,7 +75,7 @@ namespace Hotline.Share.Dtos.Order
         public DateTime? CreationTimeStart { get; set; }
         public DateTime? CreationTimeEnd { get; set; }
 
-         /// <summary>
+        /// <summary>
         /// 开始时间(流程开启时间)
         /// </summary>
         public DateTime? StartTimeStart { get; set; }
@@ -230,12 +230,12 @@ namespace Hotline.Share.Dtos.Order
         /// 是否重办
         /// </summary>
 		public bool? IsReTransact { get; set; }
-		
 
-	}
+
+    }
 
 
-	public enum FiledType
+    public enum FiledType
     {
         [Description("中心归档")]
         CenterFiled = 10,
@@ -278,14 +278,14 @@ namespace Hotline.Share.Dtos.Order
 
     }
 
-	public record OrderDelayEndHandleDto
-	{
-        public string DelayId {  get; set; }
+    public record OrderDelayEndHandleDto
+    {
+        public string DelayId { get; set; }
 
         public bool IsReviewPass { get; set; }
-	}
+    }
 
-	public class PublishOrderDelayDto
+    public class PublishOrderDelayDto
     {
         public string Id { get; set; }
 
@@ -493,7 +493,7 @@ namespace Hotline.Share.Dtos.Order
         /// 自动延期次数
         /// </summary>
         public int? AutomaticDelayNum { get; set; }
-	}
+    }
 
 
     public record DelayCalcEndTimeDto
@@ -520,36 +520,36 @@ namespace Hotline.Share.Dtos.Order
 
         public EQueryDelayState? QueryDelayState { get; set; }
 
-		/// <summary>
-		/// 0 全部  1 我的
-		/// </summary>
-		public int? DataScope { get; set; }
+        /// <summary>
+        /// 0 全部  1 我的
+        /// </summary>
+        public int? DataScope { get; set; }
 
 
-		/// <summary>
-		/// 当前办理节点
-		/// </summary>
-		public string? CurrentStepName { get; set; }
-		/// <summary>
-		/// 当前办理人
-		/// </summary>
-		public string? ActualHandlerName { get; set; }
+        /// <summary>
+        /// 当前办理节点
+        /// </summary>
+        public string? CurrentStepName { get; set; }
+        /// <summary>
+        /// 当前办理人
+        /// </summary>
+        public string? ActualHandlerName { get; set; }
 
         /// <summary>
         /// 一级部门
         /// </summary>
 		public string? OrgLevelOneName { get; set; }
 
-		/// <summary>
-		/// 延期申请时间
-		/// </summary>
-		public DateTime? StartCreationTime { get; set; }
+        /// <summary>
+        /// 延期申请时间
+        /// </summary>
+        public DateTime? StartCreationTime { get; set; }
 
-		/// <summary>
-		/// 延期申请时间
-		/// </summary>
-		public DateTime? EndCreationTime { get; set; }
-	}
+        /// <summary>
+        /// 延期申请时间
+        /// </summary>
+        public DateTime? EndCreationTime { get; set; }
+    }
 
     public record ApplySuperviseDto
     {
@@ -570,65 +570,65 @@ namespace Hotline.Share.Dtos.Order
     public record ScreenListDto : PagedKeywordRequest
     {
 
-		/// <summary>
-		/// 0 全部  1 我的
-		/// </summary>
-		public int? DataScope { get; set; }
+        /// <summary>
+        /// 0 全部  1 我的
+        /// </summary>
+        public int? DataScope { get; set; }
 
         /// <summary>
         /// 甄别类型查询条件
         /// </summary>
         public EQueryOrderScreenType? QueryScreenType { get; set; }
 
-		/// <summary>
-		/// 甄别申请状态选项卡
-		/// </summary>
-		public EScreenStatus? TabStatus { get; set; }
-
-		/// <summary>
-		/// 甄别申请状态
-		/// </summary>
-		public EScreenStatus? Status { get; set; }
-
-		/// <summary>
-		/// 编码
-		/// </summary>
-		public string? No { get; set; }
-
-		/// <summary>
-		/// 标题
-		/// </summary>
-		public string? Title { get; set; }
-
-		/// <summary>
-		/// 受理类型
-		/// </summary>
-		public string? AcceptType { get; set; }
-
-		/// <summary>
-		/// 热点类型
-		/// </summary>
-		public string? HotspotSpliceName { get; set; }
-
-		/// <summary>
-		/// 来源渠道（电话、网站、APP等）
-		/// </summary>
-		public string? SourceChannel { get; set; }
-
-		/// <summary>
-		/// 回访部门名称
-		/// </summary>
-		public string? VisitOrgName { get; set; }
-
-		/// <summary>
-		/// 甄别申请部门
-		/// </summary>
-		public string? CreatorOrgName { get; set; }
-
-		/// <summary>
-		/// 是否省工单
-		/// </summary>
-		public bool? IsProvince { get; set; }
+        /// <summary>
+        /// 甄别申请状态选项卡
+        /// </summary>
+        public EScreenStatus? TabStatus { get; set; }
+
+        /// <summary>
+        /// 甄别申请状态
+        /// </summary>
+        public EScreenStatus? Status { get; set; }
+
+        /// <summary>
+        /// 编码
+        /// </summary>
+        public string? No { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string? Title { get; set; }
+
+        /// <summary>
+        /// 受理类型
+        /// </summary>
+        public string? AcceptType { get; set; }
+
+        /// <summary>
+        /// 热点类型
+        /// </summary>
+        public string? HotspotSpliceName { get; set; }
+
+        /// <summary>
+        /// 来源渠道（电话、网站、APP等）
+        /// </summary>
+        public string? SourceChannel { get; set; }
+
+        /// <summary>
+        /// 回访部门名称
+        /// </summary>
+        public string? VisitOrgName { get; set; }
+
+        /// <summary>
+        /// 甄别申请部门
+        /// </summary>
+        public string? CreatorOrgName { get; set; }
+
+        /// <summary>
+        /// 是否省工单
+        /// </summary>
+        public bool? IsProvince { get; set; }
 
         /// <summary>
         /// 申请人
@@ -657,66 +657,66 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool? IsSendBackApplyNum { get; set; }
 
-		//甄别列表
-		/// <summary>
-		/// 一级部门名称
-		/// </summary>
-		public string? OrgLevelOneName { get; set; }
+        //甄别列表
+        /// <summary>
+        /// 一级部门名称
+        /// </summary>
+        public string? OrgLevelOneName { get; set; }
+
+        /// <summary>
+        /// 接办部门
+        /// </summary>
+        public string? CurrentHandleOrgName { get; set; }
+
+        /// <summary>
+        /// 受理时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 受理时间
+        /// </summary>
+        public DateTime? EndCreationTime { get; set; }
+
+        /// <summary>
+        /// 接办时间
+        /// </summary>
+        public DateTime? CurrentHandleTime { get; set; }
+
+        /// <summary>
+        /// 接办时间
+        /// </summary>
+        public DateTime? EndCurrentHandleTime { get; set; }
+
+        /// <summary>
+        /// 归档时间（暂为流程结束时间，因流程结束自动归档）
+        /// </summary>
+        public DateTime? FiledTime { get; set; }
+
+        /// <summary>
+        /// 归档时间（暂为流程结束时间，因流程结束自动归档）
+        /// </summary>
+        public DateTime? EndFiledTime { get; set; }
+
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        public DateTime? VisitTime { get; set; }
+
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        public DateTime? EndVisitTime { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string? Contact { get; set; }
 
-		/// <summary>
-		/// 接办部门
-		/// </summary>
-		public string? CurrentHandleOrgName { get; set; }
-
-		/// <summary>
-		/// 受理时间
-		/// </summary>
-		public DateTime? CreationTime { get; set; }
-
-		/// <summary>
-		/// 受理时间
-		/// </summary>
-		public DateTime? EndCreationTime { get; set; }
-
-		/// <summary>
-		/// 接办时间
-		/// </summary>
-		public DateTime? CurrentHandleTime { get; set; }
-
-		/// <summary>
-		/// 接办时间
-		/// </summary>
-		public DateTime? EndCurrentHandleTime { get; set; }
-
-		/// <summary>
-		/// 归档时间（暂为流程结束时间，因流程结束自动归档）
-		/// </summary>
-		public DateTime? FiledTime { get; set; }
-
-		/// <summary>
-		/// 归档时间（暂为流程结束时间，因流程结束自动归档）
-		/// </summary>
-		public DateTime? EndFiledTime { get; set; }
-
-		/// <summary>
-		/// 回访时间
-		/// </summary>
-		public DateTime? VisitTime { get; set; }
-
-		/// <summary>
-		/// 回访时间
-		/// </summary>
-		public DateTime? EndVisitTime { get; set; }
-
-		/// <summary>
-		/// 联系电话
-		/// </summary>
-		public string? Contact { get; set; }
-
-		/// <summary>
-		/// 来电电话
-		/// </summary>
-		public string? FromPhone { get; set; }
+        /// <summary>
+        /// 来电电话
+        /// </summary>
+        public string? FromPhone { get; set; }
 
         /// <summary>
         /// 当前办理节点
@@ -726,55 +726,55 @@ namespace Hotline.Share.Dtos.Order
 
     public record MayScreenListDto : PagedKeywordRequest
     {
-	    /// <summary>
-	    /// 甄别退回  0  全部  1 是  2 否
-	    /// </summary>
-	    public int? ScreenSendBack { get; set; }
-
-	    /// <summary>
-	    /// 工单编号
-	    /// </summary>
-	    public string? No { get; set; }
-
-	    /// <summary>
-	    /// 标题
-	    /// </summary>
-	    public string? Title { get; set; }
-
-	    /// <summary>
-	    /// 是否省工单
-	    /// </summary>
-	    public bool? IsProvince { get; set; }
-
-	    /// <summary>
-	    /// 受理类型
-	    /// </summary>
-	    public string? AcceptType { get; set; }
-
-	    /// <summary>
-	    /// 热点类型
-	    /// </summary>
-	    public string? HotspotSpliceName { get; set; }
-
-	    /// <summary>
-	    /// 来源渠道（电话、网站、APP等）
-	    /// </summary>
-	    public string? SourceChannel { get; set; }
-
-	    /// <summary>
-	    /// 一级部门名称
-	    /// </summary>
-	    public string? OrgLevelOneName { get; set; }
-
-	    /// <summary>
-	    /// 接办部门
-	    /// </summary>
-	    public string? CurrentHandleOrgName { get; set; }
-
-	    /// <summary>
-	    /// 回访部门名称
-	    /// </summary>
-	    public string? VisitOrgName { get; set; }
+        /// <summary>
+        /// 甄别退回  0  全部  1 是  2 否
+        /// </summary>
+        public int? ScreenSendBack { get; set; }
+
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string? No { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string? Title { get; set; }
+
+        /// <summary>
+        /// 是否省工单
+        /// </summary>
+        public bool? IsProvince { get; set; }
+
+        /// <summary>
+        /// 受理类型
+        /// </summary>
+        public string? AcceptType { get; set; }
+
+        /// <summary>
+        /// 热点类型
+        /// </summary>
+        public string? HotspotSpliceName { get; set; }
+
+        /// <summary>
+        /// 来源渠道（电话、网站、APP等）
+        /// </summary>
+        public string? SourceChannel { get; set; }
+
+        /// <summary>
+        /// 一级部门名称
+        /// </summary>
+        public string? OrgLevelOneName { get; set; }
+
+        /// <summary>
+        /// 接办部门
+        /// </summary>
+        public string? CurrentHandleOrgName { get; set; }
+
+        /// <summary>
+        /// 回访部门名称
+        /// </summary>
+        public string? VisitOrgName { get; set; }
 
         /// <summary>
         /// 受理时间
@@ -786,41 +786,41 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public DateTime? EndCreationTime { get; set; }
 
-		/// <summary>
-		/// 接办时间
-		/// </summary>
-		public DateTime? CurrentHandleTime { get; set; }
+        /// <summary>
+        /// 接办时间
+        /// </summary>
+        public DateTime? CurrentHandleTime { get; set; }
 
-		/// <summary>
-		/// 接办时间
-		/// </summary>
-		public DateTime? EndCurrentHandleTime { get; set; }
+        /// <summary>
+        /// 接办时间
+        /// </summary>
+        public DateTime? EndCurrentHandleTime { get; set; }
 
-		/// <summary>
-		/// 归档时间（暂为流程结束时间，因流程结束自动归档）
-		/// </summary>
-		public DateTime? FiledTime { get; set; }
+        /// <summary>
+        /// 归档时间（暂为流程结束时间，因流程结束自动归档）
+        /// </summary>
+        public DateTime? FiledTime { get; set; }
 
-		/// <summary>
-		/// 归档时间（暂为流程结束时间，因流程结束自动归档）
-		/// </summary>
-		public DateTime? EndFiledTime { get; set; }
+        /// <summary>
+        /// 归档时间（暂为流程结束时间，因流程结束自动归档）
+        /// </summary>
+        public DateTime? EndFiledTime { get; set; }
 
-		/// <summary>
-		/// 回访时间
-		/// </summary>
-		public DateTime? VisitTime { get; set; }
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        public DateTime? VisitTime { get; set; }
 
-		/// <summary>
-		/// 回访时间
-		/// </summary>
-		public DateTime? EndVisitTime { get; set; }
+        /// <summary>
+        /// 回访时间
+        /// </summary>
+        public DateTime? EndVisitTime { get; set; }
 
 
-		public DateTime? CreationTimeStart { get; set; }
+        public DateTime? CreationTimeStart { get; set; }
         public DateTime? CreationTimeEnd { get; set; }
         public bool? IsHomePage { get; set; }
-        
+
         /// <summary>
         /// 会签类型
         /// </summary>
@@ -841,16 +841,16 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? OrgNoSatisfiedReason { get; set; }
 
-		/// <summary>
-		/// 甄别类型
-		/// </summary>
-		public EOrderScreenType? ScreenType { get; set; }
+        /// <summary>
+        /// 甄别类型
+        /// </summary>
+        public EOrderScreenType? ScreenType { get; set; }
 
-		/// <summary>
-		/// 受理坐席名字或工号（×）
-		/// </summary>
-		public string? NameOrNo { get; set; }
-	}
+        /// <summary>
+        /// 受理坐席名字或工号（×）
+        /// </summary>
+        public string? NameOrNo { get; set; }
+    }
 
     public record UrgeListDto : PagedKeywordRequest
     {
@@ -860,6 +860,21 @@ namespace Hotline.Share.Dtos.Order
         public int? UrgeState { get; set; }
         public DateTime? CreationTimeStart { get; set; }
         public DateTime? CreationTimeEnd { get; set; }
+
+        /// <summary>
+        /// 一级部门
+        /// </summary>
+        public string? OrgLevelOneName { get; set; }
+
+        /// <summary>
+        /// 接办名称
+        /// </summary>
+        public string? ActualHandleOrgName { get; set; }
+
+        /// <summary>
+        /// 当前办理节点
+        /// </summary>
+        public string? CurrentStepCode { get; set; }
     }
 
     public class QueryRepeatableEventDto
@@ -912,49 +927,49 @@ namespace Hotline.Share.Dtos.Order
     public enum EQueryDelayState
     {
 
-	    /// <summary>
-	    /// 全部
-	    /// </summary>
-	    [Description("全部")]
-	    All = -1,
-
-		/// <summary>
-		/// 待审批
-		/// </summary>
-		[Description("待审批")]
-	    Examining = 0,
-
-	    /// <summary>
-	    /// 审批通过
-	    /// </summary>
-	    [Description("审批通过")]
-	    Pass = 1,
-
-		/// <summary>
-		/// 审批拒绝
-		/// </summary>
-		[Description("审批拒绝")]
-	    NoPass = 2,
+        /// <summary>
+        /// 全部
+        /// </summary>
+        [Description("全部")]
+        All = -1,
+
+        /// <summary>
+        /// 待审批
+        /// </summary>
+        [Description("待审批")]
+        Examining = 0,
+
+        /// <summary>
+        /// 审批通过
+        /// </summary>
+        [Description("审批通过")]
+        Pass = 1,
+
+        /// <summary>
+        /// 审批拒绝
+        /// </summary>
+        [Description("审批拒绝")]
+        NoPass = 2,
+    }
+    public enum EQueryOrderScreenType
+    {
+        /// <summary>
+        /// 全部
+        /// </summary>
+        [Description("全部")]
+        All = -1,
+
+        /// <summary>
+        /// 部门办件
+        /// </summary>
+        [Description("部门办件")]
+        Org = 0,
+
+        /// <summary>
+        /// 中心话务
+        /// </summary>
+        [Description("中心话务")]
+        Seat = 1,
     }
-	public enum EQueryOrderScreenType
-	{
-		/// <summary>
-		/// 全部
-		/// </summary>
-		[Description("全部")]
-		All = -1,
-
-		/// <summary>
-		/// 部门办件
-		/// </summary>
-		[Description("部门办件")]
-		Org = 0,
-
-		/// <summary>
-		/// 中心话务
-		/// </summary>
-		[Description("中心话务")]
-		Seat = 1,
-	}
 
 }

src/Hotline/Orders/OrderUrge.cs

@@ -22,6 +22,18 @@ namespace Hotline.Orders
         [SugarColumn(ColumnDescription = "被催办部门ID")]
         public string OrgId { get; set; }
 
+        /// <summary>
+        /// 被催办角色
+        /// </summary>
+        [SugarColumn(ColumnDescription = "被催办角色")]
+        public string? RoleId { get; set; }
+
+        /// <summary>
+        /// 实际办理步骤ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "实际办理步骤ID")]
+        public string? ActualHandleStepId { get; set; }
+
         /// <summary>
         /// 被催办部门名称
         /// </summary>