toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、优化导出任务树

Browse Source
This commit is contained in:
lidongyang
2025-12-02 10:07:59 +08:00
parent 64f33a8de3
commit cbb3e6a00b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -2028,7 +2028,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
}
allTopProjectNodeList.add(machineNode);
}
ExcelUtil.exportExcelWithMerge(JSONArray.from(allTopProjectNodeList),exportExcelFormats,httpServletResponse);
ExcelUtil.exportExcelWithMerge(JSONArray.from(allTopProjectNodeList),exportExcelFormats,new ArrayList<>(),httpServletResponse);
} else {
response = SdmResponse.failed(taskRespond.getMessage());
}

2
task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java
View File

@@ -250,7 +250,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
else
{
JSONObject taskPool = (JSONObject) taskPoolResp.getData();
ExcelUtil.exportExcelWithMerge(taskPool.getJSONArray("nodes"),req.excelHeaders,httpServletResponse);
ExcelUtil.exportExcelWithMerge(taskPool.getJSONArray("nodes"),req.excelHeaders,new ArrayList<>(),httpServletResponse);
}
return ;
}