流程流转信息接口

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -95,6 +95,8 @@ import org.ssssssss.magicapi.core.service.MagicAPIService;
 
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -5431,13 +5433,50 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                     setApproveResult(approveResultArr[1]);
                     setApproveComment(approveCommentArr[1]);
                 }});
-            } else {
+            }
+            if(p.getNodeName().equals("开始节点")) {
                 userDefinedProcessRecordListVos.add(new UserDefinedProcessRecordListVo(){{
                     setNodeType(p.getNodeType());
-                    setNodeName(p.getNodeName());
                     setComment(p.getComment());
                     setStartTime(p.getStartTime());
                     setCirculateMessage(p.getCirculateMessage());
+                    setNodeName("流程发起");
+                    setApproveResult("发起");
+                    Pattern pattern = Pattern.compile("【(.*?)】");
+                    Matcher matcher = pattern.matcher(p.getComment());
+                    if (matcher.find()) {
+                        setApproveUserName(matcher.group(1));
+                    }
+                    setApproveComment("发起流程");
+                }});
+            }
+
+            if(p.getNodeName().equals("结束节点")) {
+                userDefinedProcessRecordListVos.add(new UserDefinedProcessRecordListVo(){{
+                    setNodeType(p.getNodeType());
+                    setComment(p.getComment());
+                    setStartTime(p.getStartTime());
+                    setCirculateMessage(p.getCirculateMessage());
+                    setNodeName("流程结束");
+                    setApproveResult("完成");
+                    setApproveComment("结束流程");
+                }});
+            }
+
+            if(p.getComment().contains("准备审批")) {
+                userDefinedProcessRecordListVos.add(new UserDefinedProcessRecordListVo(){{
+                    setNodeType(p.getNodeType());
+                    setComment(p.getComment());
+                    setStartTime(p.getStartTime());
+                    setCirculateMessage(p.getCirculateMessage());
+                    setNodeName("准备审批");
+                    setApproveResult("准备审批");
+                    Pattern pattern = Pattern.compile("【(.*?)】");
+                    Matcher matcher = pattern.matcher(p.getComment());
+                    if (matcher.find()) {
+                        setApproveUserName(matcher.group(1));
+                    }
+                    setApproveComment("准备审批");
                 }});
             }
         }