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 6f4e2206..9991152c 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 @@ -2572,12 +2572,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return response; } else { ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId()); - // 构建tagMap,从数据字典查 - Map TagMap = tagMapService.getTagMapName(); - List tagList = TagMap.entrySet().stream() - .map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue())) - .toList(); - getTaskTreeReq.setTagMap(tagList); + setTagMap(getTaskTreeReq); SdmResponse treeRespond = getTaskTree(getTaskTreeReq); if (treeRespond.getData() != null) { String viewContents = JSONObject.toJSONString(treeRespond.getData()); @@ -2609,12 +2604,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return response; } else { ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId()); - // 构建tagMap,从数据字典查 - Map TagMap = tagMapService.getTagMapName(); - List tagList = TagMap.entrySet().stream() - .map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue())) - .toList(); - getTaskTreeReq.setTagMap(tagList); + setTagMap(getTaskTreeReq); SdmResponse treeRespond = getTaskTree(getTaskTreeReq); if (treeRespond.getData() != null) { String viewContents = JSONObject.toJSONString(treeRespond.getData()); @@ -2634,6 +2624,15 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return SdmResponse.success(); } + private void setTagMap(ProjectTreeTagReq getTaskTreeReq) { + // 构建tagMap,从数据字典查 + Map TagMap = tagMapService.getTagMapName(); + List tagList = TagMap.entrySet().stream() + .map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue())) + .toList(); + getTaskTreeReq.setTagMap(tagList); + } + private void addNewVersion(String projectId, String phaseId, String version, String viewContents, Long userId) { SimulationDesignVersions designVersions = new SimulationDesignVersions(); designVersions.setProjectId(projectId); diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index 49bf5c68..357f9183 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -1648,6 +1648,7 @@ public class SimulationRunServiceImpl extends ServiceImpl runPerformanceList = simulationPerformanceService.lambdaQuery()