代码优化

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java

@@ -7,7 +7,6 @@ import org.dromara.common.translation.constant.TransConstant;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Map;
 
 /**
  * 任务视图
@@ -173,7 +172,7 @@ public class TaskVo implements Serializable {
     private WfNodeConfigVo wfNodeConfigVo;
 
     /**
-     * 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}}
+     * 对象信息
      */
-    private Map<String, Object> variables;
+    private Object entity;
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java

@@ -298,6 +298,7 @@ public class ActTaskServiceImpl implements IActTaskService {
             List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
             List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
             for (TaskVo task : taskList) {
+                task.setEntity(getHistoricVariableByBusinessKey(task.getBusinessKey(), "entity"));
                 task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus()));
                 task.setParticipantVo(WorkflowUtils.getCurrentTaskParticipant(task.getId(), remoteUserService));
                 task.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null);
@@ -310,6 +311,19 @@ public class ActTaskServiceImpl implements IActTaskService {
         return TableDataInfo.build(page);
     }
 
+    // 查询历史流程变量（返回特定变量）
+    public Object getHistoricVariableByBusinessKey(String businessKey, String variableName) {
+        HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery()
+            .processInstanceBusinessKey(businessKey)
+            .singleResult();
+
+        return historyService.createHistoricVariableInstanceQuery()
+            .processInstanceId(processInstance.getId())
+            .variableName(variableName)
+            .singleResult()
+            .getValue();
+    }
+
     /**
      * 查询当前租户所有待办任务
      *