Parcourir la source

新增流程明细查询

TANG JIANG il y a 2 ans
Parent
commit
0569899508

+ 16 - 2
src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -1,5 +1,6 @@
 using Hotline.Application.FlowEngine;
 using Hotline.Application.Knowledge;
+using Hotline.FlowEngine.Workflows;
 using Hotline.KnowledgeBase;
 using Hotline.KnowledgeBase.Notifies;
 using Hotline.Permissions;
@@ -32,7 +33,7 @@ namespace Hotline.Api.Controllers
         private readonly IMediator _mediator;
         private readonly IWorkflowApplication _workflowApplication;
         private readonly IKnowledgeWorkFlowRepository _knowledgeWorkFlowRepository;
-
+        private readonly IWorkflowDomainService _workflowDomainService;
 
         /// <summary>
         /// 
@@ -46,9 +47,10 @@ namespace Hotline.Api.Controllers
         /// <param name="mediator"></param>
         /// <param name="workflowApplication"></param>
         /// <param name="knowledgeWorkFlowRepository"></param>
+        /// <param name="workflowDomainService"></param>
         public KnowledgeController(IKnowledgeRepository knowledgeRepository, IKnowledgeTempRepository knowledgeTempRepository,
            ISessionContext sessionContext, IKnowledgeDomainService knowledgeDomainService, IMapper mapper, IKnowApplication knowApplication,
-           IMediator mediator, IWorkflowApplication workflowApplication, IKnowledgeWorkFlowRepository knowledgeWorkFlowRepository)
+           IMediator mediator, IWorkflowApplication workflowApplication, IKnowledgeWorkFlowRepository knowledgeWorkFlowRepository, IWorkflowDomainService workflowDomainService)
         {
             _knowledgeRepository = knowledgeRepository;
             _knowledgeTempRepository = knowledgeTempRepository;
@@ -59,6 +61,7 @@ namespace Hotline.Api.Controllers
             _mediator = mediator;
             _workflowApplication = workflowApplication;
             _knowledgeWorkFlowRepository = knowledgeWorkFlowRepository;
+            _workflowDomainService = workflowDomainService;
         }
         #region 草稿箱
         /// <summary>
@@ -309,6 +312,17 @@ namespace Hotline.Api.Controllers
         {
             await _knowledgeDomainService.KnowledgeRevoke(workFlowId, HttpContext.RequestAborted);
         }
+
+        /// <summary>
+        /// 根据workFlowId,查询审批明细
+        /// </summary>
+        /// <param name="workFlowId"></param>
+        /// <returns></returns>
+        [HttpGet("getworkflow")]
+        public async Task<Workflow> GetWorkflow(string workFlowId)
+        {
+            return await _workflowDomainService.GetWorkflowAsync(workFlowId, withSupplements: true, cancellationToken: HttpContext.RequestAborted);
+        }
         #endregion
 
         #region 知识列表

+ 1 - 1
src/Hotline.Share/Dtos/Knowledge/KnowledgeDataDto.cs

@@ -89,7 +89,7 @@ namespace Hotline.Share.Dtos.Knowledge
         /// <summary>
         /// 审核类型
         /// </summary>
-        public string AuditType { get; set; }
+        public EKnowledgeApplyType WorkflowModuleStatus { get; set; }
 
         /// <summary>
         /// 时间,未审核的是到达时间,审核完成的是审核时间