[Fix-17189][UI] Dependent task result status icon error (#17191)

Author: SbloodyS

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowInstanceServiceImpl.java

@@ -74,7 +74,6 @@
 import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionLogMapper;
 import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
 import org.apache.dolphinscheduler.dao.mapper.WorkflowInstanceMapper;
-import org.apache.dolphinscheduler.dao.model.ITaskInstanceContext;
 import org.apache.dolphinscheduler.dao.repository.TaskInstanceContextDao;
 import org.apache.dolphinscheduler.dao.repository.TaskInstanceDao;
 import org.apache.dolphinscheduler.dao.repository.WorkflowInstanceDao;
@@ -470,7 +469,7 @@ public Map<String, Object> queryTaskListByWorkflowInstanceId(User loginUser, lon
         List<TaskInstance> taskInstanceList =
                 taskInstanceDao.queryValidTaskListByWorkflowInstanceId(workflowInstanceId,
                         workflowInstance.getTestFlag());
-        List<TaskInstanceDependentDetails<ITaskInstanceContext>> taskInstanceDependentDetailsList =
+        List<TaskInstanceDependentDetails<AbstractTaskInstanceContext>> taskInstanceDependentDetailsList =
                 setTaskInstanceDependentResult(taskInstanceList);
 
         Map<String, Object> resultMap = new HashMap<>();
@@ -482,11 +481,11 @@ public Map<String, Object> queryTaskListByWorkflowInstanceId(User loginUser, lon
         return result;
     }
 
-    private List<TaskInstanceDependentDetails<ITaskInstanceContext>> setTaskInstanceDependentResult(List<TaskInstance> taskInstanceList) {
-        List<TaskInstanceDependentDetails<ITaskInstanceContext>> taskInstanceDependentDetailsList =
+    private List<TaskInstanceDependentDetails<AbstractTaskInstanceContext>> setTaskInstanceDependentResult(List<TaskInstance> taskInstanceList) {
+        List<TaskInstanceDependentDetails<AbstractTaskInstanceContext>> taskInstanceDependentDetailsList =
                 taskInstanceList.stream()
                         .map(taskInstance -> {
-                            TaskInstanceDependentDetails<ITaskInstanceContext> taskInstanceDependentDetails =
+                            TaskInstanceDependentDetails<AbstractTaskInstanceContext> taskInstanceDependentDetails =
                                     new TaskInstanceDependentDetails<>();
                             BeanUtils.copyProperties(taskInstance, taskInstanceDependentDetails);
                             return taskInstanceDependentDetails;
@@ -497,14 +496,10 @@ private List<TaskInstanceDependentDetails<ITaskInstanceContext>> setTaskInstance
                 taskInstanceContextDao.batchQueryByTaskInstanceIdsAndContextType(taskInstanceIdList,
                         ContextType.DEPENDENT_RESULT_CONTEXT);
         for (TaskInstanceContext taskInstanceContext : taskInstanceContextList) {
-            for (AbstractTaskInstanceContext dependentResultTaskInstanceContext : taskInstanceContext
-                    .getTaskInstanceContext()) {
-                for (TaskInstanceDependentDetails<ITaskInstanceContext> taskInstanceDependentDetails : taskInstanceDependentDetailsList) {
-                    if (taskInstanceDependentDetails.getId().equals(taskInstanceContext.getTaskInstanceId())) {
-                        taskInstanceDependentDetails
-                                .setTaskInstanceDependentResult(
-                                        dependentResultTaskInstanceContext);
-                    }
+            for (TaskInstanceDependentDetails<AbstractTaskInstanceContext> taskInstanceDependentDetails : taskInstanceDependentDetailsList) {
+                if (taskInstanceDependentDetails.getId().equals(taskInstanceContext.getTaskInstanceId())) {
+                    taskInstanceDependentDetails
+                            .setTaskInstanceDependentResults(taskInstanceContext.getTaskInstanceContext());
                 }
             }
         }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstanceDependentDetails.java

@@ -17,15 +17,15 @@
 
 package org.apache.dolphinscheduler.dao.entity;
 
-import org.apache.dolphinscheduler.dao.model.ITaskInstanceContext;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class TaskInstanceDependentDetails<T extends ITaskInstanceContext> extends TaskInstance {
+public class TaskInstanceDependentDetails<T extends AbstractTaskInstanceContext> extends TaskInstance {
 
-    private T taskInstanceDependentResult;
+    private List<T> taskInstanceDependentResults;
 
 }

dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-node-status.ts

@@ -77,16 +77,22 @@ export function useNodeStatus(options: Options) {
       window.$message.success(t('project.workflow.refresh_status_succeeded'))
       taskList.value = res.taskList
       if (taskList.value) {
-        const taskInstanceDependentResult: { [key: string]: any } = {}
+        const newTaskInstanceDependentResult: { [key: string]: any } = {}
         taskList.value.forEach((taskInstance: any) => {
           setNodeStatus(taskInstance.taskCode, taskInstance.state, taskInstance)
-          if (taskInstance.taskInstanceDependentResult) {
-            const key = `${taskInstance.taskInstanceDependentResult.projectCode}-${taskInstance.taskInstanceDependentResult.workflowDefinitionCode}-${taskInstance.taskInstanceDependentResult.taskDefinitionCode}-${taskInstance.taskInstanceDependentResult.dateCycle}`
-            taskInstanceDependentResult[key] =
-              taskInstance.taskInstanceDependentResult.dependentResult
+          if (taskInstance.taskInstanceDependentResults) {
+            const taskInstanceDependentResultList =
+              taskInstance.taskInstanceDependentResults
+            taskInstanceDependentResultList.forEach(
+              (taskInstanceDependentResult: any) => {
+                const key = `${taskInstanceDependentResult.projectCode}-${taskInstanceDependentResult.workflowDefinitionCode}-${taskInstanceDependentResult.taskDefinitionCode}-${taskInstanceDependentResult.dateCycle}`
+                newTaskInstanceDependentResult[key] =
+                  taskInstanceDependentResult.dependentResult
+              }
+            )
           }
         })
-        nodeStore.updateDependentResult(taskInstanceDependentResult)
+        nodeStore.updateDependentResult(newTaskInstanceDependentResult)
       }
     })
   }