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

fix:仿真策划版本记录新增流程id

Browse Source
This commit is contained in:
zhuxinru
2026-02-28 14:10:26 +08:00
parent 2e4e9ecc7b
commit f9e3c145b3
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
1-sql/2026-02-26/simulation_design_versions.sql
View File

@@ -1 +1,2 @@
ALTER TABLE spdm_baseline.simulation_design_versions ADD beforeContents longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '上个版本内容（JSON字符串）';
ALTER TABLE spdm_baseline.simulation_design_versions ADD cidFlowId varchar(255) NULL COMMENT 'cid流程实例id';

2
project/src/main/java/com/sdm/project/model/bo/ModifyProjectNode.java
View File

@@ -64,4 +64,6 @@ public class ModifyProjectNode extends BaseEntity {
*/
public JSONObject approvePreviewInfo;
public String cidFlowId;
}

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

@@ -53,6 +53,10 @@ public class SimulationDesignVersions implements Serializable {
@TableField("beforeContents")
private String beforeContents;
@ApiModelProperty(value = "cid流程实例id")
@TableField("cidFlowId")
private String cidFlowId;
@ApiModelProperty(value = "创建者")
@TableField("creator")
private Long creator;

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

@@ -2559,7 +2559,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
String approveContents = JSONObject.toJSONString(req);
int approveAction = 2;
// 发起评审
if(launchTaskPoolApprove(req.approveTemplateId,req.approveTemplateName,approveContents,approveAction)) {
if(launchDesignApprove(req.approveTemplateId,req.approveTemplateName,approveContents,approveAction)) {
return SdmResponse.success();
} else {
return SdmResponse.failed("发起评审失败");
@@ -2602,9 +2602,10 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
newDesignVersion.setCreator(userId);
newDesignVersion.setVersionContents(viewContents);
newDesignVersion.setBeforeContents(beforeContents);
newDesignVersion.setCidFlowId(req.getCidFlowId());
simulationDesignVersionsService.save(newDesignVersion);
} else {
addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(), "V1.0", viewContents, userId);
addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(), "V1.0", viewContents, userId, req.getCidFlowId());
}
} else {
return SdmResponse.failed("获取不到任务树");
@@ -2642,9 +2643,10 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
.eq(SimulationDesignVersions::getCurrentVersion, latestVersion)
.set(SimulationDesignVersions::getVersionContents, viewContents)
.set(SimulationDesignVersions::getBeforeContents, beforeContents)
.set(ObjectUtils.isNotEmpty(req.getCidFlowId()), SimulationDesignVersions::getCidFlowId, req.getCidFlowId())
.update();
} else {
addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(),"V1.0", viewContents, userId);
addNewVersion(req.getProjectNodeId(), req.getPhaseNodeId(),"V1.0", viewContents, userId, req.getCidFlowId());
}
}
}
@@ -2661,13 +2663,14 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
getTaskTreeReq.setTagMap(tagList);
}
private void addNewVersion(String projectId, String phaseId, String version, String viewContents, Long userId) {
private void addNewVersion(String projectId, String phaseId, String version, String viewContents, Long userId, String cidFlowId) {
SimulationDesignVersions designVersions = new SimulationDesignVersions();
designVersions.setProjectId(projectId);
designVersions.setPhaseId(phaseId);
designVersions.setCurrentVersion(version);
designVersions.setVersionContents(viewContents);
designVersions.setCreator(userId);
designVersions.setCidFlowId(cidFlowId);
simulationDesignVersionsService.save(designVersions);
}
@@ -2798,7 +2801,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
/**
* 发起仿真策划评审
*/
private boolean launchTaskPoolApprove(String templateId, String templateName,String approveContents,int approveAction)
private boolean launchDesignApprove(String templateId, String templateName,String approveContents,int approveAction)
{
LaunchApproveReq req = new LaunchApproveReq();
req.templateId = templateId;
@@ -2835,6 +2838,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if(req != null) {
// 清除上次评审标记
req.setBApprove(false);
req.setCidFlowId(approveReq.cidFlowId);
modifyWithApprove(req);
}
} catch (Exception e) {