修改查询

src/Hotline.Api/Controllers/KnowledgeApplyController.cs

@@ -226,11 +226,7 @@ namespace Hotline.Api.Controllers
             var rsp = new
             {
                 EKnowledgeApplyStatus = EnumExts.GetDescriptions<EKnowledgeApplyStatus>(),
-                EKnowledgeApplyType = new List<KeyValuePair<int, string>>
-                    {
-                        new KeyValuePair<int, string>(0, "新增"),
-                        new KeyValuePair<int, string>(1, "修改")
-                    }
+                EKnowledgeApplyType = EnumExts.GetDescriptions<EApplyType>()
             };
             return rsp;
         }

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -12,7 +12,6 @@ using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.FlowEngine;
 using Hotline.Share.Dtos.Knowledge;
 using Hotline.Share.Enums.KnowledgeBase;
-using Hotline.Share.Enums.Order;
 using Hotline.Users;
 using MapsterMapper;
 using MediatR;
@@ -492,11 +491,7 @@ namespace Hotline.Api.Controllers
             var rsp = new
             {
                 EKnowledgeWorkFlowStatus = EnumExts.GetDescriptions<EKnowledgeWorkFlowStatus>(),
-                EKnowledgeApplyType = new List<KeyValuePair<int, string>>
-                    {
-                        new KeyValuePair<int, string>(0, "发布知识"),
-                        new KeyValuePair<int, string>(2, "删除知识")
-                    }
+                EKnowledgeApplyType = EnumExts.GetDescriptions<EKnowledgeApplyType>()
             };
             return rsp;
         }

src/Hotline.Application/Knowledge/KnowApplication.cs

@@ -93,7 +93,8 @@ namespace Hotline.Application.Knowledge
                    o.LastModificationTime,
                    o.WorkflowId,
                    o.ExpiredTime,
-                   o.CreatorOrgId
+                   o.CreatorOrgId,
+
                })
            //将结果合并成一个表
            .MergeTable()

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -91,7 +91,8 @@ namespace Hotline.Application.Mappers
             config.NewConfig<Hotline.KnowledgeBase.Knowledge, KnowledgeDataDto>()
               .Map(d => d.CreationName, x => x.User.Name)
                 .Map(d => d.KnowledgeTypeName, x => x.KnowledgeType.SpliceName)
-                 .Map(d => d.HotspotName, x => x.HotspotType.HotSpotFullName);
+                 .Map(d => d.HotspotName, x => x.HotspotType.HotSpotFullName)
+                  ;
 
             config.NewConfig<Hotline.KnowledgeBase.Knowledge, KnowledgeApprovalDataDto>()
             .Map(d => d.CreationName, x => x.User.Name)
@@ -105,7 +106,7 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.Id, x => x.Knowledge.Id)
                 .Map(d => d.Title, x => x.Knowledge.Title)
                 .Map(d => d.PageView, x => x.Knowledge.PageView)
-                .Map(d => d.Status, x => x.WorkFlowApplyStatus)
+                .Map(d => d.Status, x => x.Knowledge.Status)
                 .Map(d => d.WorkflowModuleStatus, x => x.WorkflowModuleStatus)
                 .Map(d => d.CurrentStepTime, x => x.Workflow.CurrentStepTime);
 

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

@@ -36,7 +36,7 @@ namespace Hotline.Share.Dtos.Knowledge
         /// <summary>
         /// 申请类型
         /// </summary>
-        public EKnowledgeApplyType KnowledgeApplyType { get; set; }
+        public EApplyType KnowledgeApplyType { get; set; }
 
         /// <summary>
         /// 处理部门Id

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

@@ -1,4 +1,5 @@
 using Hotline.Share.Enums.KnowledgeBase;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Knowledge
 {
@@ -17,13 +18,23 @@ namespace Hotline.Share.Dtos.Knowledge
         /// <summary>
         /// 申请类型
         /// </summary>
-        public EKnowledgeApplyType KnowledgeApplyType { get; set; }
+        public EApplyType KnowledgeApplyType { get; set; }
+
+        /// <summary>
+        /// 申请类型名称
+        /// </summary>
+        public string KnowledgeApplyTypeName => KnowledgeApplyType.GetDescription();
 
         /// <summary>
         /// 申请状态
         /// </summary>
         public EKnowledgeApplyStatus Status { get; set; }
 
+        /// <summary>
+        /// 申请状态名称
+        /// </summary>
+        public string StatusName => Status.GetDescription();
+
         /// <summary>
         /// 申请人
         /// </summary>

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

@@ -11,7 +11,7 @@ namespace Hotline.Share.Dtos.Knowledge
     /// <param name="IsOvertime">0：已超期；1：未超期</param>
     /// <param name="StartTime"></param>
     /// <param name="EndTime"></param>
-    public record KnowledgeApplyPagedDto(EKnowledgeApplyStatus? Status, EKnowledgeApplyType? ApplyType, string? IsOvertime, DateTime? StartTime, DateTime? EndTime) : PagedRequest;
+    public record KnowledgeApplyPagedDto(EKnowledgeApplyStatus? Status, EApplyType? ApplyType, string? IsOvertime, DateTime? StartTime, DateTime? EndTime) : PagedRequest;
 
     /// <summary>
     /// 
@@ -21,6 +21,6 @@ namespace Hotline.Share.Dtos.Knowledge
     /// <param name="IsOvertime">0：已超期；1：未超期</param>
     /// <param name="StartTime"></param>
     /// <param name="EndTime"></param>
-    public record KnowledgeHandlePagedDto(EKnowledgeApplyStatus? Status, EKnowledgeApplyType? ApplyType, string? IsOvertime, DateTime? StartTime, DateTime? EndTime) : PagedKeywordRequest;
+    public record KnowledgeHandlePagedDto(EKnowledgeApplyStatus? Status, EApplyType? ApplyType, string? IsOvertime, DateTime? StartTime, DateTime? EndTime) : PagedKeywordRequest;
 
 }

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

@@ -1,4 +1,5 @@
 using Hotline.Share.Enums.KnowledgeBase;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.Knowledge
 {
@@ -39,6 +40,11 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public EKnowledgeStatus Status { get; set; }
 
+        /// <summary>
+        /// 文档状态名称
+        /// </summary>
+        public string StatusName => Status.GetDescription();
+
         /// <summary>
         /// 流程ID
         /// </summary>
@@ -106,6 +112,21 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public EKnowledgeApplyType WorkflowModuleStatus { get; set; }
 
+        /// <summary>
+        /// 审核类型名称
+        /// </summary>
+        public string WorkflowModuleStatusName => WorkflowModuleStatus.GetDescription();
+
+        /// <summary>
+        /// 审批状态
+        /// </summary>
+        public EKnowledgeWorkFlowStatus WorkFlowApplyStatus { get; set; }
+
+        /// <summary>
+        /// 审核状态名称
+        /// </summary>
+        public string EKnowledgeWorkFlowStatus => WorkFlowApplyStatus.GetDescription();
+
         /// <summary>
         /// 到达当前办理节点时间
         /// </summary>
@@ -199,6 +220,11 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public EKnowledgeWorkFlowStatus WorkFlowApplyStatus { get; set; }
 
+        /// <summary>
+        /// 审批状态名称
+        /// </summary>
+        public string WorkFlowApplyStatusName => WorkFlowApplyStatus.GetDescription();
+
         /// <summary>
         /// 申请时间
         /// </summary>

src/Hotline.Share/Enums/KnowledgeBase/EKnowledgeApplyStatus.cs

@@ -14,20 +14,20 @@ public enum EKnowledgeApplyStatus
     Handling = 0,
 
     /// <summary>
-    /// 完成
+    /// 处理完成
     /// </summary>
-    [Description("完成")]
+    [Description("处理完成")]
     Succeed = 1,
 
     /// <summary>
-    /// 退回
+    /// 已退回
     /// </summary>
-    [Description("退回")]
+    [Description("已退回")]
     Failed = 2,
 
     /// <summary>
-    /// 撤回
+    /// 已撤回
     /// </summary>
-    [Description("撤回")]
+    [Description("已撤回")]
     Revert = 3,
 }

src/Hotline.Share/Enums/KnowledgeBase/EKnowledgeApplyType.cs

@@ -3,14 +3,38 @@
 namespace Hotline.Share.Enums.KnowledgeBase;
 
 /// <summary>
-/// 申请类型
+/// 知识审批-申请类型
 /// </summary>
 public enum EKnowledgeApplyType
 {
     /// <summary>
     /// 新增
     /// </summary>
-    [Description("发布知识")]
+    [Description("发布知识审核")]
+    Add = 0,
+
+    ///// <summary>
+    ///// 修改
+    ///// </summary>
+    //[Description("修改")]
+    //Update = 1,
+
+    /// <summary>
+    /// 删除
+    /// </summary>
+    [Description("删除知识审核")]
+    Delete = 2,
+}
+
+/// <summary>
+/// 知识申请-申请类型
+/// </summary>
+public enum EApplyType
+{
+    /// <summary>
+    /// 新增
+    /// </summary>
+    [Description("新增")]
     Add = 0,
 
     /// <summary>
@@ -19,9 +43,4 @@ public enum EKnowledgeApplyType
     [Description("修改")]
     Update = 1,
 
-    /// <summary>
-    /// 删除
-    /// </summary>
-    [Description("删除知识")]
-    Delete = 2,
 }

src/Hotline.Share/Enums/KnowledgeBase/EKnowledgeWorkFlowStatus.cs

@@ -8,27 +8,27 @@ namespace Hotline.Share.Enums.KnowledgeBase
     public enum EKnowledgeWorkFlowStatus
     {
         /// <summary>
-        /// 审批中
+        /// 审核中
         /// </summary>
-        [Description("审批中")]
+        [Description("审核中")]
         Auditing = 1,
 
         /// <summary>
-        /// 审批成功
+        /// 审核通过
         /// </summary>
-        [Description("审批成功")]
+        [Description("审核通过")]
         Success = 2,
 
         /// <summary>
         /// 撤销
         /// </summary>
-        [Description("撤销")]
+        [Description("已撤销")]
         Revoke = 3,
 
         /// <summary>
-        /// 失败
+        /// 审核不通过
         /// </summary>
-        [Description("失败")]
+        [Description("审核不通过")]
         Failed = 4
     }
 }

src/Hotline/KnowledgeBase/KnowledgeApply.cs

@@ -31,7 +31,7 @@ public class KnowledgeApply : FullStateEntity
     /// <summary>
     /// 申请类型
     /// </summary>
-    public EKnowledgeApplyType KnowledgeApplyType { get; set; }
+    public EApplyType KnowledgeApplyType { get; set; }
 
     /// <summary>
     /// 申请状态

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -199,7 +199,7 @@ namespace Hotline.KnowledgeBase
             switch (knowWorkFlow.WorkflowModuleStatus)
             {
                 case EKnowledgeApplyType.Add:
-                case EKnowledgeApplyType.Update:
+               // case EKnowledgeApplyType.Update:
                     //查询知识
                     var knowledge = await _knowledgeRepository.GetAsync(p => p.WorkflowId == workFlowId, cancellationToken);
                     if (knowledge != null)