退回列表

src/Hotline.Api/Controllers/OrderController.cs

@@ -3646,12 +3646,16 @@ public class OrderController : BaseController
              .Includes(x => x.Order)
              .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                  d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
-             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
+             .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Order.Title.Contains(dto.Title!) )
+             .WhereIF(!string.IsNullOrEmpty(dto.No),d => d.Order.No.Contains(dto.No!))
+             .WhereIF(!string.IsNullOrEmpty(dto.AcceptTypeCode), d => d.Order.AcceptTypeCode == dto.AcceptTypeCode)
+             .WhereIF(!string.IsNullOrEmpty(dto.OrgName), d => d.ApplyOrgName == dto.OrgName)
+			 .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
              .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
              .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(dto.AuditState == 3 && _sessionContext.RequiredOrgId != OrgSeedData.CenterId, x=>x.SendBackOrgId.StartsWith(_sessionContext.OrgId))
+             .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)
@@ -3673,16 +3677,31 @@ public class OrderController : BaseController
             .FirstAsync(x => x.Id == id);
     }
 
-    #endregion
-
-    #region 省工单退回
-
     /// <summary>
-    /// 工单退回列表
+    /// 列表页面基础数据
     /// </summary>
-    /// <param name="dto"></param>
     /// <returns></returns>
-    [Permission(EPermission.SendBackOrder)]
+    [HttpGet("order_previous/base-data")]
+    public async Task<object> OrderSendBackBaseData()
+    {
+	    var rsp = new
+	    {
+		    AcceptTypeOptions = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType),
+		    ESendBackAuditState = EnumExts.GetDescriptions<ESendBackAuditState>(),
+	    };
+	    return rsp;
+    }
+
+	#endregion
+
+	#region 省工单退回
+
+	/// <summary>
+	/// 工单退回列表
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <returns></returns>
+	[Permission(EPermission.SendBackOrder)]
     [HttpGet("send_back")]
     public async Task<PagedDto<OrderSendBackDto>> UrgeList([FromQuery] OrderSendBackListDto dto)
     {

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

@@ -137,8 +137,33 @@ namespace Hotline.Share.Dtos.Order
 		public ESendBackAuditState? State { get; set; }
 
 		/// <summary>
-		/// 1 待办  2 已办
+		/// 1 待办  2 已办 3全部
 		/// </summary>
 		public int AuditState { get; set; }
+
+		/// <summary>
+		/// 0 全部  1 我的
+		/// </summary>
+		public int? DataScope { get; set; }
+
+		/// <summary>
+		/// 工单标题
+		/// </summary>
+		public string Title { get; set; }
+
+		/// <summary>
+		/// 工单编号
+		/// </summary>
+		public string No { get; set; }
+
+		/// <summary>
+		/// 受理类型
+		/// </summary>
+		public string? AcceptTypeCode { get; set; }
+
+		/// <summary>
+		/// 申请部门
+		/// </summary>
+		public string? OrgName { get; set; }
 	}
 }