TANG JIANG 2 tahun lalu
induk
melakukan
58b733aa92

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

@@ -425,7 +425,7 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [HttpGet("deletelist")]
         [Permission(EPermission.KnowledgeDeleteApply)]
-        public async Task<PagedDto<KnowledgeDataDto>> GetDeleteApplyList([FromQuery] KnowledgeDeletelPagedListDto pagedDto)
+        public async Task<PagedDto<KnowledgeDeleteApplyDataDto>> GetDeleteApplyList([FromQuery] KnowledgeDeletelPagedListDto pagedDto)
         {
             var (total, items) = await _knowledgeWorkFlowRepository
                .Queryable()
@@ -447,7 +447,7 @@ namespace Hotline.Api.Controllers
                .OrderByDescending(p => p.CreationTime)
                .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
 
-            return new PagedDto<KnowledgeDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDataDto>>(items));
+            return new PagedDto<KnowledgeDeleteApplyDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDeleteApplyDataDto>>(items));
         }
 
         #endregion

+ 11 - 0
src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -109,6 +109,17 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.WorkflowModuleStatus, x => x.WorkflowModuleStatus)
                 .Map(d => d.Time, x => x.Workflow.CurrentStepTime);
 
+            config.NewConfig<KnowledgeWorkFlow, KnowledgeDeleteApplyDataDto>()
+                 .Map(d => d.Id, x => x.Knowledge.Id)
+                  .Map(d => d.Title, x => x.Knowledge.Title)
+               .Map(d => d.KnowledgeTypeName, x => x.Knowledge.KnowledgeType.SpliceName)
+               .Map(d => d.HotspotName, x => x.Knowledge.HotSpotType.HotSpotFullName)
+               .Map(d => d.CreationName, x => x.Knowledge.User.Name)
+               .Map(d => d.CreationBMName, x => x.Knowledge.SystemOrganize.OrgName)
+               .Map(d => d.PageView, x => x.Knowledge.PageView)
+               .Map(d => d.Status, x => x.Knowledge.Status)
+               .Map(d => d.WorkFlowApplyStatus, x => x.WorkflowModuleStatus);
+
             #endregion
 
             #region order

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

@@ -148,4 +148,25 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public string Department { get; set; }
     }
+
+    /// <summary>
+    /// 我的申请返回
+    /// </summary>
+    public record KnowledgeDeleteApplyDataDto : KnowledgeBaseDataDto
+    {
+        /// <summary>
+        /// 申请部门
+        /// </summary>
+        public string CreationBMName { get; set; }
+
+        /// <summary>
+        /// 审批状态
+        /// </summary>
+        public EKnowledgeWorkFlowStatus WorkFlowApplyStatus { get; set; }
+
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        public DateTime CreationTime { get; set; }
+    }
 }