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

fix[project]: 仿真策划时，可以添加3D负责人

Browse Source
This commit is contained in:
lidongyang
2026-03-20 07:17:54 +08:00
parent ff156a1864
commit 98ae5836b5
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/src/main/java/com/sdm/project/model/po/TaskNodePo.java
View File

@@ -147,6 +147,11 @@ public class TaskNodePo extends NodeAllBase {
*/ */
private String attionMembers; private String attionMembers;
/**
* 3D负责人
*/
private String tMembers;
/** /**
* 拓展属性集合 * 拓展属性集合
*/ */

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

@@ -774,10 +774,26 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
} }
} }
// 3D负责人
List<CIDUserResp> tMemberList = taskChildren.stream().filter(node -> CollectionUtils.isNotEmpty(node.getTMemberList())).flatMap(item -> item.getTMemberList().stream().filter(Objects::nonNull)).toList();
List<Long> tMemberIdList = new ArrayList<>();
List<CIDUserResp> distinctTMemberList = projectNodePo.getPayAttentionMemberList();
if (CollectionUtils.isNotEmpty(tMemberIdList)) {
for (CIDUserResp cidUserResp : tMemberList) {
if (tMemberIdList.contains(cidUserResp.getUserId())) {
continue;
}
distinctTMemberList.add(cidUserResp);
tMemberIdList.add(cidUserResp.getUserId());
}
}
projectNodePo.setPMemberList(distinctPMemberList); projectNodePo.setPMemberList(distinctPMemberList);
projectNodePo.setEMemberList(distinctEMemberList); projectNodePo.setEMemberList(distinctEMemberList);
// 仿真关注人 // 仿真关注人
projectNodePo.setPayAttentionMemberList(distinctAttionMemberList); projectNodePo.setPayAttentionMemberList(distinctAttionMemberList);
// 3D负责人
projectNodePo.setTMemberList(distinctTMemberList);
for (NodeAllBase child : children) { for (NodeAllBase child : children) {
List<NodeAllBase> eachChildren = child.getChildren(); List<NodeAllBase> eachChildren = child.getChildren();
@@ -1017,6 +1033,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
List<Long> pUserIdList = memberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).map(SimulationTaskMember::getUserId).distinct().toList(); List<Long> pUserIdList = memberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).map(SimulationTaskMember::getUserId).distinct().toList();
// 关注人 // 关注人
List<Long> attionUserIdList = memberList.stream().filter(member -> MemberTypeEnum.ATTENTION.getCode().equals(member.getType())).map(SimulationTaskMember::getUserId).distinct().toList(); List<Long> attionUserIdList = memberList.stream().filter(member -> MemberTypeEnum.ATTENTION.getCode().equals(member.getType())).map(SimulationTaskMember::getUserId).distinct().toList();
// 3D负责人
List<Long> tUserIdList = memberList.stream().filter(member -> MemberTypeEnum.THREED.getCode().equals(member.getType())).map(SimulationTaskMember::getUserId).distinct().toList();
if (CollectionUtils.isNotEmpty(eUserIdList)) { if (CollectionUtils.isNotEmpty(eUserIdList)) {
List<CIDUserResp> eMemberList = new ArrayList<>(); List<CIDUserResp> eMemberList = new ArrayList<>();
@@ -1062,6 +1080,23 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
taskNodePo.setAttionMembers(taskNodePo.getPayAttentionMemberList().stream().map(CIDUserResp::getNickname).collect(Collectors.joining(","))); taskNodePo.setAttionMembers(taskNodePo.getPayAttentionMemberList().stream().map(CIDUserResp::getNickname).collect(Collectors.joining(",")));
} }
} }
// 3D负责人
if (CollectionUtils.isNotEmpty(tUserIdList)) {
List<CIDUserResp> tMemberList = new ArrayList<>();
for (Long tUserId : tUserIdList) {
CIDUserResp cidUserResp = cidUserMap.get(tUserId);
if (ObjectUtils.isEmpty(cidUserResp)) {
continue;
}
tMemberList.add(cidUserResp);
}
taskNodePo.setTMemberList(tMemberList);
if (CollectionUtils.isNotEmpty(taskNodePo.getTMemberList())) {
taskNodePo.setTMembers(taskNodePo.getTMemberList().stream().map(CIDUserResp::getNickname).collect(Collectors.joining(",")));
}
}
} }
} }
} }