diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/CmpStepTypeEnum.java b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/CmpStepTypeEnum.java
index f01a4f18941322c64b4b47ec361b0ffad671bb83..c8c6137ff64042d9f743245def51d76e12f22618 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/enums/CmpStepTypeEnum.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/enums/CmpStepTypeEnum.java
@@ -1,6 +1,7 @@
 /**
  * <p>Title: liteflow</p>
  * <p>Description: 轻量级的组件式流程框架</p>
+ *
  * @author Bryan.Zhang
  * @email weenyc31@163.com
  * @Date 2020/4/1
@@ -14,6 +15,6 @@ package com.yomahub.liteflow.enums;
  */
 public enum CmpStepTypeEnum {
 
-	START, END, SINGLE;
+    START, END, SINGLE, WHEN_START, WHEN_END;
 
 }
diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java
index 15eb31cbd1aba1641861ab5a19cc701583b81b45..e38dbac83b7a5a45e7ef43aff132eee81c8d44b1 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java
@@ -8,13 +8,17 @@
 package com.yomahub.liteflow.flow.element.condition;
 
 import com.yomahub.liteflow.common.LocalDefaultFlowConstant;
+import com.yomahub.liteflow.enums.CmpStepTypeEnum;
 import com.yomahub.liteflow.enums.ConditionTypeEnum;
 import com.yomahub.liteflow.enums.ParallelStrategyEnum;
 import com.yomahub.liteflow.flow.element.Condition;
+import com.yomahub.liteflow.flow.entity.CmpStep;
 import com.yomahub.liteflow.flow.parallel.strategy.ParallelStrategyExecutor;
 import com.yomahub.liteflow.flow.parallel.strategy.ParallelStrategyHelper;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLoggerManager;
+import com.yomahub.liteflow.slot.DataBus;
+import com.yomahub.liteflow.slot.Slot;
 import com.yomahub.liteflow.thread.ExecutorHelper;
 
 import java.util.Set;
@@ -64,13 +68,16 @@ public class WhenCondition extends Condition {
 	// 使用线程池执行 when 并发流程
 	// 这块涉及到挺多的多线程逻辑，所以注释比较详细，看到这里的童鞋可以仔细阅读
 	private void executeAsyncCondition(Integer slotIndex) throws Exception {
-
+		Slot slot = DataBus.getSlot(slotIndex);
+		slot.addStep(new CmpStep("-1", "-1", CmpStepTypeEnum.WHEN_START));
 		// 获取并发执行策略
 		ParallelStrategyExecutor parallelStrategyExecutor = ParallelStrategyHelper.loadInstance().buildParallelExecutor(this.getParallelStrategy());
-
-		// 执行并发逻辑
-		parallelStrategyExecutor.execute(this, slotIndex);
-
+		try {
+			// 执行并发逻辑
+			parallelStrategyExecutor.execute(this, slotIndex);
+		} finally {
+			slot.addStep(new CmpStep("-1", "-1", CmpStepTypeEnum.WHEN_END));
+		}
 	}
 
 	public boolean isIgnoreError() {
diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java b/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java
index 8bd133c14e533d85144fdd4946683a81dc3cb31f..6b8787204fc62dccf45cf8f2b9b64e2f7759ae86 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/slot/Slot.java
@@ -1,6 +1,7 @@
 /**
  * <p>Title: liteflow</p>
  * <p>Description: 轻量级的组件式流程框架</p>
+ *
  * @author Bryan.Zhang
  * @email weenyc31@163.com
  * @Date 2020/4/1
@@ -11,6 +12,7 @@ import cn.hutool.core.collection.ConcurrentHashSet;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.yomahub.liteflow.enums.CmpStepTypeEnum;
 import com.yomahub.liteflow.exception.NoSuchContextBeanException;
 import com.yomahub.liteflow.exception.NullParamException;
 import com.yomahub.liteflow.flow.element.Condition;
@@ -340,6 +342,21 @@ public class Slot {
 		CmpStep cmpStep;
 		for (Iterator<CmpStep> it = executeSteps.iterator(); it.hasNext();) {
 			cmpStep = it.next();
+            if (CmpStepTypeEnum.WHEN_START.equals(cmpStep.getStepType())) {
+                str.append("【");
+                continue;
+            }
+            if (CmpStepTypeEnum.WHEN_END.equals(cmpStep.getStepType())) {
+                // 如果最后一个是==>则移除最后一个==>
+                if (str.toString().endsWith("==>")) {
+                    str.delete(str.length() - 3, str.length());
+                }
+                str.append("】");
+                if (it.hasNext()) {
+                    str.append("==>");
+                }
+                continue;
+            }
 			if (withTimeSpent) {
 				str.append(cmpStep.buildStringWithTime());
 			}
@@ -376,6 +393,21 @@ public class Slot {
 		CmpStep cmpStep;
 		for (Iterator<CmpStep> it = rollbackSteps.iterator(); it.hasNext();) {
 			cmpStep = it.next();
+            if (CmpStepTypeEnum.WHEN_START.equals(cmpStep.getStepType())) {
+                str.append("【");
+                continue;
+            }
+            if (CmpStepTypeEnum.WHEN_END.equals(cmpStep.getStepType())) {
+                // 如果最后一个是==>则移除最后一个==>
+                if (str.toString().endsWith("==>")) {
+                    str.delete(str.length() - 3, str.length());
+                }
+                str.append("】");
+                if (it.hasNext()) {
+                    str.append("==>");
+                }
+                continue;
+            }
 			if (withRollbackTimeSpent) {
 				str.append(cmpStep.buildRollbackStringWithTime());
 			}