fix:数据查询
This commit is contained in:
@@ -95,4 +95,6 @@ public class SpdmNodeVo extends BaseEntity {
|
||||
|
||||
private String exeStatus;
|
||||
|
||||
private String parentId;
|
||||
|
||||
}
|
||||
|
||||
@@ -1558,8 +1558,17 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public SdmResponse editExperimentResult(ExperimentResultReq req) {
|
||||
deleteExperimentResult(req);
|
||||
batchAddExperimentResult(req);
|
||||
SimulationExperimentResult experimentResult = simulationExpResultService.getById(req.getId());
|
||||
if (StringUtils.isNotBlank(req.getExpName())) {
|
||||
experimentResult.setExpName(req.getExpName());
|
||||
}
|
||||
if (StringUtils.isNotBlank(req.getExpData())) {
|
||||
experimentResult.setExpData(req.getExpData());
|
||||
}
|
||||
if (StringUtils.isNotBlank(req.getExpDesc())) {
|
||||
experimentResult.setExpDesc(req.getExpDesc());
|
||||
}
|
||||
simulationExpResultService.updateById(experimentResult);
|
||||
return SdmResponse.success();
|
||||
}
|
||||
|
||||
|
||||
@@ -888,8 +888,16 @@ public class TaskServiceImpl implements ITaskService {
|
||||
if (NodeTypeEnum.PROJECT.getValue().equals(eachProjectNodePo.getNodeType())) {
|
||||
task.setProjectName(eachProjectNodePo.getNodeName());
|
||||
} else if (NodeTypeEnum.PHASE.getValue().equals(eachProjectNodePo.getNodeType())) {
|
||||
// 当前工况所属阶段,但是所属项目也要展示
|
||||
SpdmNodeVo projectNode = nodeMapper.getNodeById(eachProjectNodePo.getParentId());
|
||||
task.setProjectName(projectNode.getNodeName());
|
||||
task.setPhaseName(eachProjectNodePo.getNodeName());
|
||||
} else if (NodeTypeEnum.DISCIPLINE.getValue().equals(eachProjectNodePo.getNodeType())) {
|
||||
// 当前工况所属学科,但是所属项目和阶段也要展示
|
||||
SpdmNodeVo phaseNode = nodeMapper.getNodeById(eachProjectNodePo.getParentId());
|
||||
task.setPhaseName(phaseNode.getNodeName());
|
||||
SpdmNodeVo projectNode = nodeMapper.getNodeById(phaseNode.getParentId());
|
||||
task.setProjectName(projectNode.getNodeName());
|
||||
task.setDisciplineName(eachProjectNodePo.getNodeName());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user