diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 63f1906f..c4ef931e 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -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("获取不到任务树"); } diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 2fd2ec58..e7200918 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -2505,12 +2505,20 @@ public class TaskServiceImpl implements ITaskService { log.info("算例查询中,未查询到算例1"); return SdmResponse.success(new ArrayList<>()); } + + + List 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 filterRunList = new ArrayList<>(); // 根据创建时间过滤 if (CollectionUtils.isNotEmpty(req.getCreateTime())) { LocalDateTime startTime = req.getStartTime();