|
|
@ -89,6 +89,7 @@ public class TaskService implements ITaskService{ |
|
|
|
if (ObjectUtil.isNotNull(queryTask.getPanel())){ |
|
|
|
int panelRow = queryTask.getPanel().getRow(); |
|
|
|
int panelCol = queryTask.getPanel().getCol(); |
|
|
|
//创建任务面板的二维数组
|
|
|
|
for (int i = 0; i < panelRow; i++) { |
|
|
|
List<TaskVo.TaskPluginInfo> pluginInfoList = new ArrayList<>(); |
|
|
|
for (int j = 0; j < panelCol; j++) { |
|
|
@ -96,6 +97,7 @@ public class TaskService implements ITaskService{ |
|
|
|
} |
|
|
|
plugins.add(pluginInfoList); |
|
|
|
} |
|
|
|
//将插件放入二维数组对应的位置中
|
|
|
|
List<TaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(queryTask.getDetailId()); |
|
|
|
for (TaskVo.TaskPluginInfo taskPlugin : taskPluginInfoList) { |
|
|
|
int pluginCol = taskPlugin.getCol(); |
|
|
@ -173,7 +175,6 @@ public class TaskService implements ITaskService{ |
|
|
|
queryPluginForTask(taskMap.get(min)); |
|
|
|
return taskMap.get(min); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
queryPluginForTask(regularTask); |
|
|
|
return regularTask; |
|
|
|