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

1、导出任务修改为脚本导出

Browse Source
This commit is contained in:
lidongyang
2026-01-27 18:56:47 +08:00
parent 30f8f87642
commit d1a01ff981
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
project/src/main/java/com/sdm/project/model/vo/SpdmExportNewTaskVo.java
View File

@@ -160,5 +160,14 @@ public class SpdmExportNewTaskVo extends BaseEntity {
*/
private String commitmentDeadline;
/**
* 为了脚本导出新增的字段
*/
private String project;
private String machine;
private String workspace;
private String phase;
private String discipline;
}

30
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -39,6 +39,7 @@ import com.sdm.common.feign.impl.capability.SimulationFlowFeignClientImpl;
import com.sdm.common.feign.impl.data.DataClientFeignClientImpl;
import com.sdm.common.feign.impl.system.MessageFeignClientImpl;
import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
import com.sdm.common.utils.RandomUtil;
import com.sdm.common.utils.SystemOperate;
import com.sdm.common.utils.excel.ExcelUtil;
import com.sdm.project.bo.ExportOperate;
@@ -1589,11 +1590,9 @@ public class TaskServiceImpl implements ITaskService {
}
req.setCurrent(1);
req.setSize(10000);
List<ExportExcelFormat> exportExcelFormats = taskExportExcelFormat.getExcelHeaders();
SdmResponse taskRespond = list(req);
SdmResponse response = new SdmResponse();
if (taskRespond.isSuccess()) {
JSONObject dataObj = (JSONObject) taskRespond.getData();
SdmResponse response = list(req);
if (response.isSuccess()) {
JSONObject dataObj = (JSONObject) response.getData();
List<SpdmNewTaskVo> taskVoList = (List<SpdmNewTaskVo>) dataObj.get("data");
List<SpdmExportNewTaskVo> exportNewTaskVoList = new ArrayList<>();
List<CIDUserResp> pMemberList;
@@ -1613,12 +1612,27 @@ public class TaskServiceImpl implements ITaskService {
BeanUtils.copyProperties(spdmNewTaskVo, spdmExportNewTaskVo);
spdmExportNewTaskVo.setPMemberList(pMemberName);
spdmExportNewTaskVo.setEMemberList(eMemberName);
spdmExportNewTaskVo.setProject(spdmExportNewTaskVo.getTag1());
spdmExportNewTaskVo.setPhase(spdmExportNewTaskVo.getTag2());
spdmExportNewTaskVo.setMachine(spdmExportNewTaskVo.getTag4());
spdmExportNewTaskVo.setWorkspace(spdmExportNewTaskVo.getTag5());
spdmExportNewTaskVo.setDiscipline(spdmExportNewTaskVo.getDiscipline());
exportNewTaskVoList.add(spdmExportNewTaskVo);
}
ExcelUtil.exportExcelNoMerge(JSONArray.from(exportNewTaskVoList), exportExcelFormats, httpServletResponse);
} else {
response = SdmResponse.failed(taskRespond.getMessage());
dataObj.put("data",exportNewTaskVoList);
response.setData(dataObj);
String taskFileName = exportOperate.convertToFile(JSON.toJSONString(response), JSON.toJSONString(taskExportExcelFormat));
File file = new File(taskFileName);
if(!file.exists()) {
response = SdmResponse.failed("任务文件不存在");
}else {
String taskSaveName = "仿真任务_" + RandomUtil.generateString(6) +".xlsx";
SystemOperate.outputHttpFileStream(httpServletResponse, taskFileName, taskSaveName);
file.delete();
}
return response;
}
response = SdmResponse.failed(response.getMessage());
return response;
}