diff --git a/1-sql/2026-01-29/simulation_design_versions.sql b/1-sql/2026-01-29/simulation_design_versions.sql new file mode 100644 index 00000000..65931fa6 --- /dev/null +++ b/1-sql/2026-01-29/simulation_design_versions.sql @@ -0,0 +1 @@ +ALTER TABLE spdm_baseline.simulation_design_versions ADD phaseId varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '阶段uuid'; diff --git a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java index 05321916..84e43863 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java @@ -105,8 +105,8 @@ public class SimulationProjectController implements ISimulationProjectFeignClien @GetMapping("/queryDesignVersions") @Operation(summary = "查询项目仿真策划版本信息", description = "查询项目仿真策划版本信息") - public SdmResponse queryDesignVersions(@RequestParam("projectId") String projectId) { - return projectService.queryDesignVersions(projectId); + public SdmResponse queryDesignVersions(@RequestParam("projectId") String projectId, @RequestParam("phaseId") String phaseId) { + return projectService.queryDesignVersions(projectId, phaseId); } } diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationDesignVersions.java b/project/src/main/java/com/sdm/project/model/entity/SimulationDesignVersions.java index 10e9655b..ee2dc445 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationDesignVersions.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationDesignVersions.java @@ -28,6 +28,10 @@ public class SimulationDesignVersions implements Serializable { @TableField("projectId") private String projectId; + @ApiModelProperty(value = "阶段UUID") + @TableField("phaseId") + private String phaseId; + @ApiModelProperty(value = "当前策划版本号") @TableField("currentVersion") private String currentVersion; diff --git a/project/src/main/java/com/sdm/project/service/IProjectService.java b/project/src/main/java/com/sdm/project/service/IProjectService.java index d7cbba78..b13ad655 100644 --- a/project/src/main/java/com/sdm/project/service/IProjectService.java +++ b/project/src/main/java/com/sdm/project/service/IProjectService.java @@ -37,6 +37,6 @@ public interface IProjectService { SdmResponse exportTaskTreeByScript(TaskTreeExportExcelFormat taskTreeExportExcelFormat, HttpServletResponse httpservletResponse); - SdmResponse queryDesignVersions(String projectId); + SdmResponse queryDesignVersions(String projectId, String phaseId); } 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 94021ea9..85576cc2 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 @@ -2477,13 +2477,14 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { SimulationDesignVersions newDesignVersion = new SimulationDesignVersions(); newDesignVersion.setProjectId(req.getProjectNodeId()); + newDesignVersion.setPhaseId(req.getPhaseNodeId()); newDesignVersion.setCurrentVersion(newVersion); newDesignVersion.setParentVersion(latestVersion.getCurrentVersion()); newDesignVersion.setCreator(userId); newDesignVersion.setVersionContents(viewContents); simulationDesignVersionsService.save(newDesignVersion); } else { - addNewVersion(req.getProjectNodeId(), "V1.0", viewContents, userId); + addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(), "V1.0", viewContents, userId); } } else { return SdmResponse.failed("获取不到任务树"); @@ -2502,11 +2503,12 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { if (StringUtils.isNotEmpty(req.getCurrentVersion())) { simulationDesignVersionsService.lambdaUpdate() .eq(SimulationDesignVersions::getProjectId, req.getProjectNodeId()) + .eq(SimulationDesignVersions::getPhaseId, req.getPhaseNodeId()) .eq(SimulationDesignVersions::getCurrentVersion, req.getCurrentVersion()) .set(SimulationDesignVersions::getVersionContents, viewContents) .update(); } else { - addNewVersion(req.getProjectNodeId(), "V1.0", viewContents, userId); + addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(),"V1.0", viewContents, userId); } } } @@ -2514,9 +2516,10 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return SdmResponse.success(); } - private void addNewVersion(String projectId, String version, String viewContents, Long userId) { + private void addNewVersion(String projectId, String phaseId, String version, String viewContents, Long userId) { SimulationDesignVersions designVersions = new SimulationDesignVersions(); designVersions.setProjectId(projectId); + designVersions.setPhaseId(phaseId); designVersions.setCurrentVersion(version); designVersions.setVersionContents(viewContents); designVersions.setCreator(userId); @@ -3313,8 +3316,11 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { } @Override - public SdmResponse queryDesignVersions(String projectId) { - List versions = simulationDesignVersionsService.lambdaQuery().eq(SimulationDesignVersions::getProjectId, projectId).list(); + public SdmResponse queryDesignVersions(String projectId, String phaseId) { + List versions = simulationDesignVersionsService.lambdaQuery() + .eq(SimulationDesignVersions::getProjectId, projectId) + .eq(SimulationDesignVersions::getPhaseId, phaseId) + .list(); return SdmResponse.success(versions); }