终止

src/Hotline.Api/Controllers/OrderTerminateController.cs

@@ -83,7 +83,7 @@ namespace Hotline.Api.Controllers
 			var isAdmin = _orderDomainService.IsCheckAdmin();
 			var (total, items) =await _orderRepository.Queryable(isAdmin:isAdmin)
 				.Includes(d=>d.OrderTerminates)
-				.Where(d=> SqlFunc.Subqueryable<OrderTerminate>().Where(t=>t.Status == ETerminateStatus.End || t.Status == ETerminateStatus.Refuse).NotAny())
+				.Where(d=> SqlFunc.Subqueryable<OrderTerminate>().Where(t=>t.Status == ETerminateStatus.End || t.Status == ETerminateStatus.Refuse || t.Status == ETerminateStatus.Approval).NotAny())
 				.Where(d => d.Status >= EOrderStatus.Filed && d.ActualHandleOrgCode.StartsWith(_sessionContext.OrgId))
 				.WhereIF(!string.IsNullOrEmpty(dto.No),d=>d.No!.Contains(dto.No!))
 				.WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title!.Contains(dto.Title!))
@@ -111,6 +111,8 @@ namespace Hotline.Api.Controllers
 				.WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Order.Title!.Contains(dto.Title!))
 				.WhereIF(dto.ApplyStartTime.HasValue && dto.ApplyEndTime.HasValue,
 					d => d.CreationTime >= dto.ApplyStartTime && d.CreationTime <= dto.ApplyEndTime)
+				.WhereIF(dto.QueryType is 1, d=>d.CreatorId == _sessionContext.UserId)
+				.WhereIF(dto.Status.HasValue,d=>d.Status == dto.Status)
 				.WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue, d => d.Order.StartTime >= dto.StartTime && d.Order.StartTime <= dto.EndTime)
 				.OrderByDescending(d => d.CreationTime);
 			var (total, items) = await query
@@ -298,5 +300,19 @@ namespace Hotline.Api.Controllers
 			}
 			return rspModel;
 		}
+
+		/// <summary>
+		/// 列表页面基础数据
+		/// </summary>
+		/// <returns></returns>
+		[HttpGet("base")]
+		public async Task<object> ScreenBaseData()
+		{
+			var rsp = new
+			{
+				Status = EnumExts.GetDescriptions<ETerminateStatus>(),
+			};
+			return rsp;
+		}
 	}
 }

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

@@ -745,8 +745,12 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public bool? ProvinceSendBack { get; set; }
 
+		/// <summary>
+		/// 终止
+		/// </summary>
+		public List<OrderTerminateDto> OrderTerminates { get; set; }
 
-    }
+	}
 
     public class UpdateOrderDto : AddOrderDto
     {

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

@@ -128,9 +128,9 @@ namespace Hotline.Share.Dtos.Order
 		public string? Title { get; set; }
 
 		/// <summary>
-		/// 审批状态  0全部  1待审批 2已审批 
+		/// 审批状态 
 		/// </summary>
-		public int AuditStatus { get; set; }
+		public ETerminateStatus? Status { get; set; }
 
 		/// <summary>
 		/// 申请开始时间
@@ -151,6 +151,11 @@ namespace Hotline.Share.Dtos.Order
 		/// 工单受理结束时间
 		/// </summary>
 		public DateTime? EndTime { get; set; }
+
+		/// <summary>
+		/// 查询类型  0 全部 1自己
+		/// </summary>
+		public int?  QueryType { get; set; }
 	}
 
 	public enum ETerminateStatus