xf преди 2 години
родител
ревизия
62a4ffa1cb
променени са 2 файла, в които са добавени 17 реда и са изтрити 1 реда
  1. 15 1
      src/Hotline.Application/Mappers/MapperConfigs.cs
  2. 2 0
      src/Hotline.Share/Dtos/FlowEngine/WorkflowDto.cs

+ 15 - 1
src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -64,11 +64,24 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.StepId, s => s.Id);
 
             config.ForType<WorkflowSupplement, WorkflowSupplementDto>()
-                .IgnoreIf((s, d) => s.Creator == null, d => d.Creator);
+                .Map(d => d.CreationTime, x => x.CreationTime)
+                .Map(d => d.Additions, x => x.Additions)
+                .Map(d => d.Opinion, x => x.Opinion)
+                .Map(d=>d.Creator.Name,x=>x.Creator.Name)
+                .IgnoreNonMapped(true)
+                ;
 
             config.ForType<Workflow, WorkflowDto>()
                 .IgnoreIf((s, d) => s.Assigns == null || !s.Assigns.Any(), d => d.AssignOrgs)
+                .IgnoreIf((s, d) => s.Supplements == null || !s.Supplements.Any(), d => d.Supplements)
+                .IgnoreIf((s, d) => s.StepBoxes == null || !s.StepBoxes.Any(), d => d.StepBoxes)
+                .IgnoreIf((s, d) => s.Traces == null || !s.Traces.Any(), d => d.Traces)
+                .IgnoreIf((s, d) => s.Definition == null, d => d.Definition)
                 .Map(d => d.AssignOrgs, s => string.Join(',', s.Assigns.Select(d => d.OrgName)))
+                .Ignore(d => d.Definition)
+                //.Ignore(d=>d.Supplements)
+                .Ignore(d => d.StepBoxes)
+                .Ignore(d => d.Traces)
                 ;
 
             config.ForType<BasicWorkflowDto, WorkflowStep>()
@@ -133,6 +146,7 @@ namespace Hotline.Application.Mappers
                 .Ignore(d => d.Workflow.Definition)
                 .Ignore(d => d.Workflow.StepBoxes)
                 .Ignore(d => d.Workflow.Traces)
+                .IgnoreNullValues(true)
                 ;
 
             config.ForType<AddOrderDto, Order>()

+ 2 - 0
src/Hotline.Share/Dtos/FlowEngine/WorkflowDto.cs

@@ -94,6 +94,8 @@ namespace Hotline.Share.Dtos.FlowEngine
         /// </summary>
         public List<string> Additions { get; set; } = new();
 
+        public DateTime CreationTime { get; set; }
+
         public UserDto Creator { get; set; }
     }
 }