Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -563,17 +563,17 @@ namespace Hotline.Api.Controllers
 		/// </summary>
 		/// <param name="id"></param>
 		/// <returns></returns>
-		[HttpGet("audit_log/{Id}")]
-		public async Task<PagedDto<KnowledgeWorkFlowDto>> KnowRetrieval(string id)
+		[HttpGet("audit_log")]
+		public async Task<PagedDto<KnowledgeWorkFlowDto>> KnowRetrieval([FromQuery] AuditLogListPagedDto pagedDto)
 		{
 			var (total, temp) =await _knowledgeWorkFlowRepository
 				.Queryable()
 				.Includes(x => x.User)
 				.Includes(x => x.SystemOrganize)
 				.Includes(x => x.Workflow)
-				.Where(x=>x.KnowledgeId == id)
+				.Where(x=>x.KnowledgeId == pagedDto.id)
 				.Where(x => x.IsDeleted == false)
-				.ToPagedListAsync(0, 99999);
+				.ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
 			return new PagedDto<KnowledgeWorkFlowDto>(total, _mapper.Map<IReadOnlyList<KnowledgeWorkFlowDto>>(temp));
 		}
 		#endregion

src/Hotline.Share/Dtos/FlowEngine/Workflow/WorkflowDto.cs

@@ -102,6 +102,11 @@ namespace Hotline.Share.Dtos.FlowEngine.Workflow
         /// </summary>
 		public DateTime? CenterToOrgTime { get; set; }
 
+        /// <summary>
+        /// 实际办理时间
+        /// </summary>
+        public DateTime? ActualHandleTime { get; set; }
+
 	}
 
     public class WorkflowAssignDto

src/Hotline.Share/Dtos/Knowledge/KnowledgePagedDto.cs

@@ -9,11 +9,17 @@ namespace Hotline.Share.Dtos.Knowledge
     public record MyDraftsListPagedDto(string? KnowledgeTypeId, DateTime? StartTime, DateTime? EndTime) : PagedKeywordRequest;
 
     /// <summary>
-    /// 审核管理
+    /// 审核记录
     /// </summary>
-    /// <param name="EKnowledgeApplyType">申请类型</param>
-    /// <param name="EKnowledgeWorkFlowStatus">审核状态</param>
-    public record KnowledgeApprovalPagedListDto(EKnowledgeApplyType? EKnowledgeApplyType, EKnowledgeWorkFlowStatus? EKnowledgeWorkFlowStatus) : PagedKeywordRequest;
+    /// <param name="id"></param>
+    public record AuditLogListPagedDto(string? id) : PagedKeywordRequest;
+
+	/// <summary>
+	/// 审核管理
+	/// </summary>
+	/// <param name="EKnowledgeApplyType">申请类型</param>
+	/// <param name="EKnowledgeWorkFlowStatus">审核状态</param>
+	public record KnowledgeApprovalPagedListDto(EKnowledgeApplyType? EKnowledgeApplyType, EKnowledgeWorkFlowStatus? EKnowledgeWorkFlowStatus) : PagedKeywordRequest;
 
 	/// <summary>
 	/// 知识检索

src/Hotline.Share/Dtos/Knowledge/KnowledgeWorkFlowDto.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Hotline.Share.Dtos.FlowEngine.Workflow;
 using Hotline.Share.Dtos.Users;
 using Hotline.Share.Dtos.Org;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Knowledge
 {
@@ -22,11 +23,15 @@ namespace Hotline.Share.Dtos.Knowledge
 		/// </summary>
 		public EKnowledgeApplyType WorkflowModuleStatus { get; set; }
 
+		public string WorkflowModuleStatusText => WorkflowModuleStatus.GetDescription();
+
 		/// <summary>
 		/// 审批状态
 		/// </summary>
 		public EKnowledgeWorkFlowStatus WorkFlowApplyStatus { get; set; }
 
+		public string WorkFlowApplyStatusText => WorkFlowApplyStatus.GetDescription();
+
 		/// <summary>
 		/// 审核时间
 		/// </summary>