1、数据查询中导出指标 bugfix
This commit is contained in:
@@ -31,7 +31,7 @@ public class PerformanceAnalysisExportExcelParam {
|
|||||||
private String disciplineNodeId;
|
private String disciplineNodeId;
|
||||||
|
|
||||||
@Schema( description = "任务节点id")
|
@Schema( description = "任务节点id")
|
||||||
private String taskNodeId;
|
private String taskId;
|
||||||
|
|
||||||
@Schema( description = "算例id")
|
@Schema( description = "算例id")
|
||||||
private String runId;
|
private String runId;
|
||||||
|
|||||||
@@ -1879,6 +1879,10 @@ public class TaskServiceImpl implements ITaskService {
|
|||||||
taskReq.setCreateTime(null);
|
taskReq.setCreateTime(null);
|
||||||
taskReq.setStartTime(null);
|
taskReq.setStartTime(null);
|
||||||
taskReq.setFinishTime(null);
|
taskReq.setFinishTime(null);
|
||||||
|
TagReq performanceTagReq = taskReq.getTagReq();
|
||||||
|
if (performanceTagReq != null) {
|
||||||
|
performanceTagReq.setTaskId(req.getTaskNodeId());
|
||||||
|
}
|
||||||
SdmResponse response = analysisTaskList(taskReq);
|
SdmResponse response = analysisTaskList(taskReq);
|
||||||
if (ObjectUtils.isEmpty(response)) {
|
if (ObjectUtils.isEmpty(response)) {
|
||||||
log.info("指标查询中,未查询到任务1");
|
log.info("指标查询中,未查询到任务1");
|
||||||
@@ -2035,8 +2039,10 @@ public class TaskServiceImpl implements ITaskService {
|
|||||||
}
|
}
|
||||||
performanceNodePo.setRunName(simulationRun.getRunName());
|
performanceNodePo.setRunName(simulationRun.getRunName());
|
||||||
TagReq tagReq = performanceNodePo.getTagReq();
|
TagReq tagReq = performanceNodePo.getTagReq();
|
||||||
tagReq.setRunId(simulationRun.getUuid());
|
if (tagReq != null) {
|
||||||
tagReq.setRunName(simulationRun.getRunName());
|
tagReq.setRunId(simulationRun.getUuid());
|
||||||
|
tagReq.setRunName(simulationRun.getRunName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
jsonObject.put("data", performanceList);
|
jsonObject.put("data", performanceList);
|
||||||
return SdmResponse.success(jsonObject);
|
return SdmResponse.success(jsonObject);
|
||||||
@@ -4362,6 +4368,7 @@ public class TaskServiceImpl implements ITaskService {
|
|||||||
req.getParams().setSize(10000);
|
req.getParams().setSize(10000);
|
||||||
SpdmAnalysisPerformanceListReq spdmAnalysisPerformanceListReq = new SpdmAnalysisPerformanceListReq();
|
SpdmAnalysisPerformanceListReq spdmAnalysisPerformanceListReq = new SpdmAnalysisPerformanceListReq();
|
||||||
BeanUtils.copyProperties(req.getParams(), spdmAnalysisPerformanceListReq);
|
BeanUtils.copyProperties(req.getParams(), spdmAnalysisPerformanceListReq);
|
||||||
|
spdmAnalysisPerformanceListReq.setTaskNodeId(req.getParams().getTaskId());
|
||||||
SdmResponse response = analysisPerformanceList(spdmAnalysisPerformanceListReq);
|
SdmResponse response = analysisPerformanceList(spdmAnalysisPerformanceListReq);
|
||||||
if (ObjectUtils.isEmpty(response)) {
|
if (ObjectUtils.isEmpty(response)) {
|
||||||
log.error("exportRunByScript,未查询到任务1");
|
log.error("exportRunByScript,未查询到任务1");
|
||||||
|
|||||||
Reference in New Issue
Block a user