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

fix:仿真策划版本新增阶段id

Browse Source
This commit is contained in:
zhuxinru
2026-01-28 20:50:51 +08:00
parent 38e862224a
commit ca7b21cc9b
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
1-sql/2026-01-29/simulation_design_versions.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE spdm_baseline.simulation_design_versions ADD phaseId varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '阶段uuid';

4
project/src/main/java/com/sdm/project/controller/SimulationProjectController.java
View File

@@ -105,8 +105,8 @@ public class SimulationProjectController implements ISimulationProjectFeignClien
@GetMapping("/queryDesignVersions") @GetMapping("/queryDesignVersions")
@Operation(summary = "查询项目仿真策划版本信息", description = "查询项目仿真策划版本信息") @Operation(summary = "查询项目仿真策划版本信息", description = "查询项目仿真策划版本信息")
public SdmResponse queryDesignVersions(@RequestParam("projectId") String projectId) { public SdmResponse queryDesignVersions(@RequestParam("projectId") String projectId, @RequestParam("phaseId") String phaseId) {
return projectService.queryDesignVersions(projectId); return projectService.queryDesignVersions(projectId, phaseId);
} }
} }

4
project/src/main/java/com/sdm/project/model/entity/SimulationDesignVersions.java
View File

@@ -28,6 +28,10 @@ public class SimulationDesignVersions implements Serializable {
@TableField("projectId") @TableField("projectId")
private String projectId; private String projectId;
@ApiModelProperty(value = "阶段UUID")
@TableField("phaseId")
private String phaseId;
@ApiModelProperty(value = "当前策划版本号") @ApiModelProperty(value = "当前策划版本号")
@TableField("currentVersion") @TableField("currentVersion")
private String currentVersion; private String currentVersion;

2
project/src/main/java/com/sdm/project/service/IProjectService.java
View File

@@ -37,6 +37,6 @@ public interface IProjectService {
SdmResponse exportTaskTreeByScript(TaskTreeExportExcelFormat taskTreeExportExcelFormat, HttpServletResponse httpservletResponse); SdmResponse exportTaskTreeByScript(TaskTreeExportExcelFormat taskTreeExportExcelFormat, HttpServletResponse httpservletResponse);
SdmResponse queryDesignVersions(String projectId); SdmResponse queryDesignVersions(String projectId, String phaseId);
} }

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

@@ -2477,13 +2477,14 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
SimulationDesignVersions newDesignVersion = new SimulationDesignVersions(); SimulationDesignVersions newDesignVersion = new SimulationDesignVersions();
newDesignVersion.setProjectId(req.getProjectNodeId()); newDesignVersion.setProjectId(req.getProjectNodeId());
newDesignVersion.setPhaseId(req.getPhaseNodeId());
newDesignVersion.setCurrentVersion(newVersion); newDesignVersion.setCurrentVersion(newVersion);
newDesignVersion.setParentVersion(latestVersion.getCurrentVersion()); newDesignVersion.setParentVersion(latestVersion.getCurrentVersion());
newDesignVersion.setCreator(userId); newDesignVersion.setCreator(userId);
newDesignVersion.setVersionContents(viewContents); newDesignVersion.setVersionContents(viewContents);
simulationDesignVersionsService.save(newDesignVersion); simulationDesignVersionsService.save(newDesignVersion);
} else { } else {
addNewVersion(req.getProjectNodeId(), "V1.0", viewContents, userId); addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(), "V1.0", viewContents, userId);
} }
} else { } else {
return SdmResponse.failed("获取不到任务树"); return SdmResponse.failed("获取不到任务树");
@@ -2502,11 +2503,12 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (StringUtils.isNotEmpty(req.getCurrentVersion())) { if (StringUtils.isNotEmpty(req.getCurrentVersion())) {
simulationDesignVersionsService.lambdaUpdate() simulationDesignVersionsService.lambdaUpdate()
.eq(SimulationDesignVersions::getProjectId, req.getProjectNodeId()) .eq(SimulationDesignVersions::getProjectId, req.getProjectNodeId())
.eq(SimulationDesignVersions::getPhaseId, req.getPhaseNodeId())
.eq(SimulationDesignVersions::getCurrentVersion, req.getCurrentVersion()) .eq(SimulationDesignVersions::getCurrentVersion, req.getCurrentVersion())
.set(SimulationDesignVersions::getVersionContents, viewContents) .set(SimulationDesignVersions::getVersionContents, viewContents)
.update(); .update();
} else { } 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(); 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(); SimulationDesignVersions designVersions = new SimulationDesignVersions();
designVersions.setProjectId(projectId); designVersions.setProjectId(projectId);
designVersions.setPhaseId(phaseId);
designVersions.setCurrentVersion(version); designVersions.setCurrentVersion(version);
designVersions.setVersionContents(viewContents); designVersions.setVersionContents(viewContents);
designVersions.setCreator(userId); designVersions.setCreator(userId);
@@ -3313,8 +3316,11 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
} }
@Override @Override
public SdmResponse queryDesignVersions(String projectId) { public SdmResponse queryDesignVersions(String projectId, String phaseId) {
List<SimulationDesignVersions> versions = simulationDesignVersionsService.lambdaQuery().eq(SimulationDesignVersions::getProjectId, projectId).list(); List<SimulationDesignVersions> versions = simulationDesignVersionsService.lambdaQuery()
.eq(SimulationDesignVersions::getProjectId, projectId)
.eq(SimulationDesignVersions::getPhaseId, phaseId)
.list();
return SdmResponse.success(versions); return SdmResponse.success(versions);
} }