Merge pull request 'insist-dev 20240604' (#4) from insist-dev into master

Reviewed-on: http://git.aizuda.com/aizuda/aizuda-boot/pulls/4

src/main/java/com/aizuda/boot/modules/flw/entity/FlwProcessApproval.java

@@ -53,6 +53,9 @@ public class FlwProcessApproval extends SuperEntity {
     @Schema(description = "任务名称")
     private String taskName;
 
+    @Schema(description = "任务 key 唯一标识")
+    private String taskKey;
+
     @Schema(description = "审批类型 0，评论 1，发起 2，抄送 3，办理 4，驳回 5，认领 6，转办 7，委派 8，跳转 9，拿回 10，唤醒 11，前加签 12，并加签 13，后加签 14，减签 15，撤销 16，终止 17，超时 18，委派归还任务")
     @NotNull(groups = Create.class)
     @PositiveOrZero

src/main/java/com/aizuda/boot/modules/flw/flow/FlowTaskListener.java

@@ -81,6 +81,9 @@ public class FlowTaskListener implements TaskListener {
                 }
             }
             fpa.setContent(content);
+
+            //用于流程图颜色标记
+            fpa.setTaskKey(flwTask.getTaskKey());
         }
 
         if (EventType.autoComplete.equals(eventType) || EventType.autoReject.equals(eventType)) {

src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -142,7 +142,7 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
         for (FlwProcessApproval fpa : processApprovals) {
             if (!Objects.equals(0, fpa.getType())) {
                 // 已执行节点
-                renderNodes.put(fpa.getTaskName(), 0);
+                renderNodes.put(fpa.getTaskKey(), 0);
             }
         }
 
@@ -175,12 +175,12 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
 
                 // 正在执行节点
                 for (FlwTask ft : flwTaskList) {
-                    renderNodes.put(ft.getTaskName(), 1);
+                    renderNodes.put(ft.getTaskKey(), 1);
                 }
             }
         } else {
             // 流程结束
-            renderNodes.put("结束", 0);
+            renderNodes.put("flk_end", 0);
         }
 
         vo.setRenderNodes(renderNodes);