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

Merge branch 'main' of http://carsafe.uicp.cn/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2026-03-13 18:36:42 +08:00
parent 03faed2e49 e5ff13dbd9
commit fd2d385cca
16 changed files with 66 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
project/src/main/java/com/sdm/project/model/vo/SpdmTaskDetailVo.java
View File

@@ -1,5 +1,6 @@
package com.sdm.project.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.sdm.common.entity.pojo.BaseEntity;
import com.sdm.common.entity.resp.system.CIDUserResp;
@@ -178,4 +179,15 @@ public class SpdmTaskDetailVo extends BaseEntity {
private String tag8Code;
private String tag9Code;
private String tag10Code;
/**
* 关联的需求提出人
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long submitter;
/**
* 关联的需求提出人名称
*/
private String submitterName;
}

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

@@ -1340,7 +1340,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
if (CollectionUtils.isNotEmpty(runList)) {
List<String> runIdList = runList.stream().map(SpdmDeleteProjectDetailReq::getUuid).toList();
log.info("删除算例：{}",runIdList);
simulationRunService.removeBatchByIds(runIdList);
simulationRunService.lambdaUpdate().in(SimulationRun::getUuid, runIdList).remove();
for (String uuid : runIdList) {
deleteDirNew(uuid);
}

3
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -1325,6 +1325,9 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
SdmResponse<FileMetadataInfoResp> fileBaseInfoResp = dataFeignClient.getFileBaseInfo(getFileBaseInfoReq);
if (fileBaseInfoResp.getData() != null && fileBaseInfoResp.getData().getTagReq() != null) {
TagReq tagReq = fileBaseInfoResp.getData().getTagReq();
if (StringUtils.isNotBlank(uuid)) {
tagReq.setTaskId(uuid);
}
req.setTagReq(tagReq);
}
}

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

@@ -3594,20 +3594,6 @@ public class TaskServiceImpl implements ITaskService {
spdmNewTaskVo::setTag5,
spdmNewTaskVo::setTag5Code);
}
taskVoList.forEach(task -> {
SpdmNodeVo phaseNode = nodeMapper.getNodeById(task.getNewTag2());
if (phaseNode != null) {
task.setPhaseName(phaseNode.getNodeName());
task.setTag2(phaseNode.getNodeName());
}
SpdmNodeVo projectNode = nodeMapper.getNodeById(task.getNewTag1());
if (projectNode != null) {
task.setProjectName(projectNode.getNodeName());
task.setTag1(projectNode.getNodeName());
}
});
List<String> taskIdList = taskVoList.stream().map(SpdmNewTaskVo::getUuid).toList();
List<SpdmTaskMemberVo> memberList = mapper.getMemberList(taskIdList, null);
List<SpdmTaskDetailVo> spdmTaskDetailVoList = new ArrayList<>();