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

Merge branch 'main' of http://www.carsafe-caem.com/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2025-12-17 19:23:55 +08:00
parent 126e6fc2c5 e669427a34
commit cd073edb5a
6 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/model/po/TaskRunPo.java
View File

@@ -76,6 +76,8 @@ public class TaskRunPo extends BaseEntity {
private String disciplineName;
private String analysisName;
/**
* 仿真负责人
*/

11
project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java
View File

@@ -69,6 +69,17 @@ public class SpdmAnalysisTaskVo extends BaseEntity {
*/
private String pMembers;
private String tag1;
private String tag2;
private String tag3;
private String tag4;
private String tag5;
private String tag6;
private String tag7;
private String tag8;
private String tag9;
private String tag10;

2
project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java
View File

@@ -95,4 +95,6 @@ public class SpdmNodeVo extends BaseEntity {
private String exeStatus;
private String parentId;
}

13
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -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();
}

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

@@ -884,15 +884,19 @@ public class TaskServiceImpl implements ITaskService {
List<TaskNodeMemberPo> eachTaskNodeMemberPoList;
for (SpdmAnalysisTaskVo task : taskVoList) {
eachProjectNodePo = nodeMap.get(task.getNodeId());
if (ObjectUtils.isNotEmpty(eachProjectNodePo)) {
if (NodeTypeEnum.PROJECT.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setProjectName(eachProjectNodePo.getNodeName());
} else if (NodeTypeEnum.PHASE.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setPhaseName(eachProjectNodePo.getNodeName());
} else if (NodeTypeEnum.DISCIPLINE.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setDisciplineName(eachProjectNodePo.getNodeName());
}
SpdmNodeVo phaseNode = nodeMapper.getNodeById(task.getTag2());
if (phaseNode != null) {
task.setPhaseName(phaseNode.getNodeName());
}
SpdmNodeVo projectNode = nodeMapper.getNodeById(task.getTag1());
if (projectNode != null) {
task.setProjectName(projectNode.getNodeName());
}
if (eachProjectNodePo != null && NodeTypeEnum.DISCIPLINE.getValue().equals(eachProjectNodePo.getNodeType())) {
task.setDisciplineName(eachProjectNodePo.getNodeName());
}
eachTaskNodeMemberPoList = memberMap.get(task.getUuid());
if (CollectionUtils.isNotEmpty(eachTaskNodeMemberPoList)) {
task.setPMembers(eachTaskNodeMemberPoList.stream().map(TaskNodeMemberPo::getName).collect(Collectors.joining(",")));
@@ -952,6 +956,7 @@ public class TaskServiceImpl implements ITaskService {
taskRunPo.setProjectName(eachTaskVo.getProjectName());
taskRunPo.setPhaseName(eachTaskVo.getPhaseName());
taskRunPo.setDisciplineName(eachTaskVo.getDisciplineName());
taskRunPo.setAnalysisName(eachTaskVo.getTaskName());
taskRunPo.setPMembers(eachTaskVo.getPMembers());
}

1
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -182,6 +182,7 @@
and STR_TO_DATE(end_time,'%Y-%m-%d') <= #{req.endTime}
]]>
</if>
order by create_time desc
</select>