toolchaintechnologycenter/spdm-backend
1
0
Fork 0
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:
gulongcheng
2026-01-22 20:29:13 +08:00
parent 98b5b16393 5a96acadcd
commit 08fa6c9a27
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/src/main/java/com/sdm/project/model/entity/SimulationWork.java
View File

@@ -64,6 +64,9 @@ public class SimulationWork implements Serializable {
@TableField(exist = false)
private CIDUserResp ownerValue;
@TableField(exist = false)
private String ownerStr;
@ApiModelProperty(value = "描述")
@TableField("description")
private String description;

7
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -626,13 +626,6 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
if (nodeMapper.addNodeBatch(addNodeList) <= 0) {
return null;
}
for (SpdmProjectNodeEditReq spdmProjectNodeEditReq : addNodeList) {
if (NodeTypeEnum.PROJECT.getValue().equals(spdmProjectNodeEditReq.getNodeType())) {
createDir(spdmProjectNodeEditReq.getUuid(), spdmProjectNodeEditReq.getNodeType(), null, spdmProjectNodeEditReq.getNodeName());
}else {
createDir(spdmProjectNodeEditReq.getUuid(), spdmProjectNodeEditReq.getNodeType(), spdmProjectNodeEditReq.getPid(), spdmProjectNodeEditReq.getNodeName());
}
}
SpdmProjectNodeEditReq projectNode = addNodeList.stream().filter(node -> NodeTypeEnum.PROJECT.getValue().equals(node.getNodeType())).findFirst().orElse(null);
List<SpdmProjectNodeEditReq> addPhaseNodeList = addNodeList.stream().filter(node -> NodeTypeEnum.PHASE.getValue().equals(node.getNodeType())).toList();
List<SpdmProjectNodeEditReq> addMachineNodeList = addNodeList.stream().filter(node -> NodeTypeEnum.MACHINE.getValue().equals(node.getNodeType())).toList();

1
project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java
View File

@@ -137,6 +137,7 @@ public class SimulationWorkServiceImpl extends ServiceImpl<SimulationWorkMapper,
continue;
}
simulationWork.setOwnerValue(userMap.get(simulationWork.getOwner()));
simulationWork.setOwnerStr(String.valueOf(simulationWork.getOwner()));
}
PageInfo<SimulationWork> page = new PageInfo<>(workList);
return PageUtils.getJsonObjectSdmResponse(workList, page);

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

@@ -504,7 +504,7 @@ public class TaskServiceImpl implements ITaskService {
taskMemberVoList = mapper.getMemberList(taskList.stream().map(SpdmTaskVo::getUuid).toList(), null);
if (CollectionUtils.isNotEmpty(taskMemberVoList)) {
if (type != 1 && CollectionUtils.isNotEmpty(taskMemberVoList)) {
if (ObjectUtils.isNotEmpty(req.getPMemberList())) {
List<Long> pMemberIdList = Stream.of(req.getPMemberList().split(",")).map(Long::valueOf).toList();
// 通过仿真负责人过滤