fix audit bug

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/action/actions/RejectAction.java

@@ -8,7 +8,6 @@
 import com.codingapi.flow.event.FlowRecordTodoEvent;
 import com.codingapi.flow.event.IFlowEvent;
 import com.codingapi.flow.exception.FlowStateException;
-import com.codingapi.flow.exception.FlowValidationException;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.script.action.RejectActionScript;

flow-engine-framework/src/main/java/com/codingapi/flow/backup/WorkflowBackup.java

@@ -47,7 +47,7 @@ public WorkflowBackup(Workflow workflow) {
         this.workCode = workflow.getCode();
         this.workTitle = workflow.getTitle();
         this.createTime = System.currentTimeMillis();
-        this.workVersion = workflow.getCreatedTime();
+        this.workVersion = workflow.getUpdatedTime();
     }
 
 

flow-engine-framework/src/main/java/com/codingapi/flow/form/FlowForm.java

@@ -69,6 +69,7 @@ public static FlowForm fromMap(Map<String, Object> map) {
                 fieldMeta.setType(DataType.valueOf((String) field.get("type")));
                 fieldMeta.setRequired(Boolean.TRUE.equals(field.get("required")));
                 fieldMeta.setDefaultValue((String) field.get("defaultValue"));
+                fieldMeta.setPlaceholder((String) field.get("placeholder"));
                 fieldMeta.setTooltip((String) field.get("tooltip"));
                 fieldMeta.setHelp((String) field.get("help"));
                 fieldList.add(fieldMeta);

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/ProcessNode.java

@@ -49,16 +49,30 @@ public class ProcessNode {
      */
     private int state;
 
+
     /**
      * 节点审批人
      */
     private List<FlowOperatorBody> operators;
 
 
-    public boolean isHistory(){
+    public boolean isHistory() {
         return this.state == STATE_HISTORY;
     }
 
+    private ProcessNode(IFlowNode flowNode) {
+        this.state = STATE_HISTORY;
+        this.operators = new ArrayList<>();
+        this.nodeType = flowNode.getType();
+        this.nodeName = flowNode.getName();
+        this.nodeId = flowNode.getId();
+    }
+
+    public static ProcessNode createEndNode(Workflow workflow) {
+        IFlowNode endNode = workflow.getEndNode();
+        return new ProcessNode(endNode);
+    }
+
     public ProcessNode(FlowRecord flowRecord, Workflow workflow) {
         this.nodeId = flowRecord.getNodeId();
         IFlowNode flowNode = workflow.getFlowNode(this.nodeId);
@@ -92,7 +106,7 @@ public void setCurrentState() {
 
     @Override
     public boolean equals(Object target) {
-        if(target instanceof ProcessNode) {
+        if (target instanceof ProcessNode) {
             ProcessNode targetNode = (ProcessNode) target;
             return targetNode.getNodeId().equals(this.getNodeId());
         }
@@ -122,7 +136,11 @@ public static class FlowOperatorBody {
         private String signKey;
 
         /**
-         * 审批记录
+         * 审批动作
+         */
+        private String actionName;
+        /**
+         * 审批人
          */
         private FlowOperator flowOperator;
         /**
@@ -134,6 +152,7 @@ public FlowOperatorBody(FlowRecord flowRecord) {
             this.advice = flowRecord.getAdvice();
             this.signKey = flowRecord.getSignKey();
             this.approveTime = flowRecord.getCreateTime();
+            this.actionName = flowRecord.getActionName();
             this.flowOperator = new FlowOperator(flowRecord.getCurrentOperatorId(), flowRecord.getCurrentOperatorName());
         }
 

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java

@@ -103,6 +103,11 @@ public class FlowRecord {
      */
     private String actionType;
 
+    /**
+     * 动作名称
+     */
+    private String actionName;
+
     /**
      * 审批意见
      */
@@ -161,11 +166,11 @@ public class FlowRecord {
     private boolean notify;
 
     /**
-     * 节点状态 | 待办、已办
+     * 节点状态 | 待办 0、已办 1
      */
     private int recordState;
     /**
-     * 流程状态 | 运行中、已完成、异常、删除
+     * 流程状态 | 运行中 0、终止 1 已完成 2、异常 3、删除 4
      */
     private int flowState;
     /**
@@ -277,6 +282,7 @@ public FlowRecord(FlowSession flowSession, int nodeOrder) {
         this.recordState = SATE_RECORD_TODO;
         this.actionId = action.id();
         this.actionType = action.type();
+        this.actionName = action.title();
 
         this.currentOperatorId = currentOperator.getUserId();
         this.currentOperatorName = currentOperator.getName();
@@ -406,6 +412,7 @@ public void update(FlowSession flowSession, boolean pass) {
         this.formData = flowSession.getFormData().toMapData();
         this.actionId = flowAction.id();
         this.actionType = flowAction.type();
+        this.actionName = flowAction.title();
         this.readable = true;
         this.readTime = System.currentTimeMillis();
         this.updateTime = System.currentTimeMillis();

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java

@@ -82,15 +82,39 @@ private void loadWorkflow() {
     public List<ProcessNode> processNodes() {
         long backupId = 0;
         if (this.flowRecord != null) {
-            backupId = this.flowRecord.getWorkBackupId();
-            // 查询历史记录
-            List<FlowRecord> historyRecords = flowRecordRepository.findBeforeRecords(flowRecord.getProcessId(), flowRecord.getId());
-            for (FlowRecord historyRecord : historyRecords) {
-                ProcessNode processNode = new ProcessNode(historyRecord, this.workflow);
-                nodeList.add(processNode);
+            // 如果当前记录已结束，则不查询后续流程
+            if(this.flowRecord.isDone()){
+
+                List<FlowRecord> historyRecords =  flowRecordRepository.findProcessRecords(this.flowRecord.getProcessId());
+                for (FlowRecord historyRecord : historyRecords) {
+                    ProcessNode processNode = new ProcessNode(historyRecord, this.workflow);
+                    nodeList.add(processNode);
+                }
+
+                if(this.flowRecord.isFinish()){
+                    nodeList.add(ProcessNode.createEndNode(this.workflow));
+                }
+
+                return this.nodeList;
+            }else {
+                backupId = this.flowRecord.getWorkBackupId();
+                // 查询历史记录
+                List<FlowRecord> historyRecords = flowRecordRepository.findBeforeRecords(flowRecord.getProcessId(), flowRecord.getId());
+                for (FlowRecord historyRecord : historyRecords) {
+                    ProcessNode processNode = new ProcessNode(historyRecord, this.workflow);
+                    nodeList.add(processNode);
+                }
             }
         }
 
+        this.loadNextNode(backupId);
+
+        return this.nodeList;
+    }
+
+
+    private void loadNextNode(long backupId){
+
         ActionManager actionManager = currentNode.actionManager();
         IFlowAction flowAction = actionManager.getAction(PassAction.class);
         FormData formData = new FormData(this.workflow.getForm());
@@ -112,7 +136,6 @@ public List<ProcessNode> processNodes() {
         List<ProcessNode> nextNodes =  nextNodeLoader.loadNextNode(flowSession);
 
         this.nodeList.addAll(nextNodes);
-        return this.nodeList;
     }
 
 

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/FlowRecordConvertor.java

@@ -26,6 +26,7 @@ public static FlowRecord convert(FlowRecordEntity entity) {
                 entity.getProcessId(),
                 entity.getActionId(),
                 entity.getActionType(),
+                entity.getActionName(),
                 entity.getAdvice(),
                 entity.getSignKey(),
                 entity.getCurrentOperatorId(),
@@ -77,6 +78,7 @@ public static FlowRecordEntity convert(FlowRecord record) {
         entity.setProcessId(record.getProcessId());
         entity.setActionId(record.getActionId());
         entity.setActionType(record.getActionType());
+        entity.setActionName(record.getActionName());
         entity.setAdvice(record.getAdvice());
         entity.setSignKey(record.getSignKey());
         entity.setCurrentOperatorId(record.getCurrentOperatorId());

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/FlowRecordEntity.java

@@ -70,6 +70,11 @@ public class FlowRecordEntity {
      */
     private String actionType;
 
+    /**
+     * 动作名称
+     */
+    private String actionName;
+
     /**
      * 审批意见
      */

frontend/apps/app-pc/src/pages/todo.tsx

@@ -16,6 +16,7 @@ const TodoPage: React.FC = () => {
 
     const [selectVisible, setSelectVisible] = React.useState(false);
     const [approvalVisible, setApprovalVisible] = React.useState(false);
+    const [reviewVisible, setReviewVisible] = React.useState(false);
     const [workflowCode, setWorkflowCode] = React.useState<string>('');
     const [currentRecordId, setCurrentRecordId] = React.useState<string>('');
     const [currentTab, setCurrentTab] = React.useState<string>('todo');
@@ -80,11 +81,24 @@ const TodoPage: React.FC = () => {
                             <a
                                 onClick={() => {
                                     setCurrentRecordId(record.recordId);
+                                    setReviewVisible(false);
                                     setApprovalVisible(true);
                                 }}
                             >办理</a>
                         </Space>
                     )
+                }else {
+                    return (
+                        <Space>
+                            <a
+                                onClick={() => {
+                                    setCurrentRecordId(record.recordId);
+                                    setReviewVisible(true);
+                                    setApprovalVisible(true);
+                                }}
+                            >详情</a>
+                        </Space>
+                    )
                 }
 
             }
@@ -185,6 +199,7 @@ const TodoPage: React.FC = () => {
                             type={'primary'}
                             onClick={() => {
                                 setCurrentRecordId('');
+                                setReviewVisible(false);
                                 setSelectVisible(true);
                             }}>发起流程</Button>
                     )
@@ -207,6 +222,7 @@ const TodoPage: React.FC = () => {
                 workflowCode={workflowCode}
                 open={approvalVisible}
                 recordId={currentRecordId}
+                review={reviewVisible}
                 onClose={() => {
                     setApprovalVisible(false);
                     reloadCurrentTab();

frontend/packages/flow-pc/flow-pc-approval/package.json

@@ -31,6 +31,7 @@
     "@flow-engine/flow-pc-form": "workspace:*",
     "@reduxjs/toolkit": "^2.11.2",
     "antd": "^6.2.1",
+    "dayjs": "^1.11.19",
     "immer": "^11.1.3",
     "react-redux": "^9.2.0"
   },