Merge pull request #14 from EasyAbp/update-UpdateProcessStateModel

Update `UpdateProcessStateModel`
EasyAbp · Jun 30, 2024 · 04ff2c1 · 04ff2c1
2 parents fd3060e + 69b05cc
commit 04ff2c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
  <LangVersion>latest</LangVersion>
- <Version>1.0.0-preview.1</Version>
+ <Version>1.0.0-preview.2</Version>
  <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
  <AbpProjectType>module</AbpProjectType>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/...cessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateEto.cs b/...cessManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateEto.cs
@@ -1,4 +1,5 @@
 using System;
+using Volo.Abp;
 using Volo.Abp.MultiTenancy;
 
 namespace EasyAbp.ProcessManagement.Processes;
@@ -8,14 +9,17 @@ public class UpdateProcessStateEto : UpdateProcessStateModel, IMultiTenant
 {
  public Guid? TenantId { get; set; }
 
+ public string CorrelationId { get; set; }
+
  public UpdateProcessStateEto()
  {
  }
 
  public UpdateProcessStateEto(Guid? tenantId, string correlationId, string? actionName, ProcessStateFlag stateFlag,
  string? stateSummaryText, DateTime stateUpdateTime, string stateName, string? stateDetailsText) : base(
- correlationId, actionName, stateFlag, stateSummaryText, stateUpdateTime, stateName, stateDetailsText)
+ actionName, stateFlag, stateSummaryText, stateUpdateTime, stateName, stateDetailsText)
  {
  TenantId = tenantId;
+ CorrelationId = Check.NotNullOrWhiteSpace(correlationId, nameof(correlationId));
  }
 }
diff --git a/...ssManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateModel.cs b/...ssManagement.Domain.Shared/EasyAbp/ProcessManagement/Processes/UpdateProcessStateModel.cs
@@ -7,8 +7,6 @@ namespace EasyAbp.ProcessManagement.Processes;
 [Serializable]
 public class UpdateProcessStateModel : ExtensibleObject, IProcessState
 {
- public string CorrelationId { get; set; }
-
  public string? ActionName { get; set; }
 
  public ProcessStateFlag StateFlag { get; set; }
@@ -25,10 +23,9 @@ public UpdateProcessStateModel()
  {
  }
 
- public UpdateProcessStateModel(string correlationId, string? actionName, ProcessStateFlag stateFlag,
- string? stateSummaryText, DateTime stateUpdateTime, string stateName, string? stateDetailsText)
+ public UpdateProcessStateModel(string? actionName, ProcessStateFlag stateFlag, string? stateSummaryText,
+ DateTime stateUpdateTime, string stateName, string? stateDetailsText)
  {
- CorrelationId = Check.NotNullOrWhiteSpace(correlationId, nameof(correlationId));
  ActionName = actionName;
  StateFlag = stateFlag;
  StateSummaryText = stateSummaryText;