Browse Source

是否可以办理

TANG JIANG 2 years ago
parent
commit
d6cdcfbb21

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

@@ -1,4 +1,5 @@
-using Hotline.Application.FlowEngine;
+using Conductor.Domain.Models;
+using Hotline.Application.FlowEngine;
 using Hotline.Application.Knowledge;
 using Hotline.FlowEngine.Definitions;
 using Hotline.FlowEngine.Workflows;
@@ -17,6 +18,7 @@ using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
+using WorkflowCore.Primitives;
 using XF.Domain.Authentications;
 using XF.Domain.Exceptions;
 
@@ -481,7 +483,8 @@ namespace Hotline.Api.Controllers
                 .OrderByDescending(p => p.CreationTime)
                 .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
 
-            //var canHandle = items.First().Workflow.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgCode);
+            //处理是否可以办理
+            items.ForEach(d => d.CanHandle = d.Workflow.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgCode));
 
             return new PagedDto<KnowledgeApprovalDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeApprovalDataDto>>(items));
         }

+ 5 - 0
src/Hotline.Share/Dtos/Knowledge/KnowledgeApplyPageDto.cs

@@ -34,6 +34,11 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public string CreationOrgName { get; set; }
 
+        /// <summary>
+        /// 处理人
+        /// </summary>
+        public string Processor { get; set; }
+
         /// <summary>
         /// 截止时间
         /// </summary>

+ 3 - 0
src/Hotline.Share/Dtos/Knowledge/KnowledgeDataDto.cs

@@ -121,6 +121,9 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public DateTime? HandleTime { get; set; }
 
+        /// <summary>
+        /// 是否可以办理
+        /// </summary>
         public bool CanHandle { get; set; }
     }
 

+ 6 - 0
src/Hotline/KnowledgeBase/KnowledgeWorkFlow.cs

@@ -38,5 +38,11 @@ namespace Hotline.KnowledgeBase
         /// </summary>
         [Navigate(NavigateType.OneToOne, nameof(WorkflowId))]//一对一 
         public Workflow Workflow { get; set; }
+
+        /// <summary>
+        /// 是否可以办理
+        /// </summary>
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public bool CanHandle { get; set; }
     }
 }