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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2026-03-17 16:50:26 +08:00
parent ade8dcc642 95773cc597
commit a15b443eb3
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2800,6 +2800,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
.eq(SimulationDesignVersions::getProjectId, req.getProjectNodeId())
.eq(SimulationDesignVersions::getPhaseId, req.getPhaseNodeId())
.list();
log.info("保存策划版本信息");
if (CollectionUtils.isNotEmpty(designVersions)) {
// 根据最新版本升版
SimulationDesignVersions latestVersion = designVersions.stream().sorted(Comparator.comparing(SimulationDesignVersions::getCreateTime).reversed()).collect(Collectors.toList()).get(0);
@@ -2820,10 +2821,13 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
newDesignVersion.setVersionContents(viewContents);
newDesignVersion.setBeforeContents(beforeContents);
newDesignVersion.setCidFlowId(req.getCidFlowId());
log.info("保存中");
simulationDesignVersionsService.save(newDesignVersion);
log.info("保存结束");
} else {
addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(), "V1.0", viewContents, userId, req.getCidFlowId());
}
log.info("保存策划版本信息结束");
} else {
return SdmResponse.failed("获取不到任务树");
}

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

@@ -2505,12 +2505,20 @@ public class TaskServiceImpl implements ITaskService {
log.info("算例查询中，未查询到算例1");
return SdmResponse.success(new ArrayList<>());
}
List<TaskRunPo> filterRunList = new ArrayList<>();
// 根据runId过滤
TagReq tagReq = req.getTagReq();
if (tagReq != null && StringUtils.isNotBlank(tagReq.getRunId())) {
runPoList = runPoList.stream().filter(run -> tagReq.getRunId().equals(run.getUuid())).collect(Collectors.toList());
}
if (CollectionUtils.isEmpty(runPoList)) {
log.info("算例查询中，未查询到算例2");
return SdmResponse.success(new ArrayList<>());
}
List<TaskRunPo> filterRunList = new ArrayList<>();
// 根据创建时间过滤
if (CollectionUtils.isNotEmpty(req.getCreateTime())) {
LocalDateTime startTime = req.getStartTime();