diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj
index 8c9185900..9be2ef017 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj
@@ -12,11 +12,11 @@
-
+
-
+
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs
new file mode 100644
index 000000000..72ea3b444
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+ public class ExecutionPointerDto
+ {
+ public string Id { get; set; }
+ public int StepId { get; set; }
+ public bool Active { get; set; }
+ public DateTime? SleepUntil { get; set; }
+ public object PersistenceData { get; set; }
+ public DateTime? StartTime { get; set; }
+ public DateTime? EndTime { get; set; }
+ public string EventName { get; set; }
+ public string EventKey { get; set; }
+ public bool EventPublished { get; set; }
+ public object EventData { get; set; }
+ public string StepName { get; set; }
+ public int RetryCount { get; set; }
+ public List Children { get; set; } = new List();
+ public object ContextItem { get; set; }
+ public string PredecessorId { get; set; }
+ public object Outcome { get; set; }
+ public string Status { get; set; }
+ public List Scope { get; set; } = new List();
+ public Dictionary ExtensionAttributes { get; set; } = new Dictionary();
+
+ }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs
index 82b280e76..cdc522749 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs
@@ -1,16 +1,19 @@
using System;
+using System.Collections.Generic;
namespace LINGYUN.Abp.WorkflowManagement.Workflows
{
public class WorkflowInstanceDto
{
- public string WorkflowId { get; set; }
+ public string Id { get; set; }
public object Data { get; set; }
public string DefinitionId { get; set; }
public int Version { get; set; }
public string Status { get; set; }
+ public string Description { get; set; }
public string Reference { get; set; }
- public DateTime StartTime { get; set; }
- public DateTime? EndTime { get; set; }
+ public DateTime CreateTime { get; set; }
+ public DateTime? CompleteTime { get; set; }
+ public ICollection ExecutionPointers { get; set; } = new List();
}
}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs
index 5e8aa2ddc..6f79d0009 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs
@@ -10,14 +10,13 @@ namespace LINGYUN.Abp.WorkflowManagement
{
public WorkflowManagementApplicationMapperProfile()
{
+ CreateMap()
+ .ForMember(dto => dto.Status, map => map.MapFrom(src => src.Status.ToString()));
CreateMap()
- .ForMember(dto => dto.WorkflowId, map => map.MapFrom(src => src.Id.ToString()))
.ForMember(dto => dto.DefinitionId, map => map.MapFrom(src => src.Id.ToString()))
- .ForMember(dto => dto.StartTime, map => map.MapFrom(src => src.CreateTime))
- .ForMember(dto => dto.EndTime, map => map.MapFrom(src => src.CompleteTime));
+ .ForMember(dto => dto.Status, map => map.MapFrom(src => src.Status.ToString()));
CreateMap();
-
CreateMap();
CreateMap();
CreateMap()