diff --git a/common/src/main/java/com/sdm/common/entity/req/lyric/SpdmAcceptTodoInfoReq.java b/common/src/main/java/com/sdm/common/entity/req/lyric/SpdmAcceptTodoInfoReq.java index 4893f47c..fbd56599 100644 --- a/common/src/main/java/com/sdm/common/entity/req/lyric/SpdmAcceptTodoInfoReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/lyric/SpdmAcceptTodoInfoReq.java @@ -26,4 +26,10 @@ public class SpdmAcceptTodoInfoReq { */ private String materialNo; + /** + * 3D负责人(暂定工号) + */ + private String threeDimensionalPerformer; + + } diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index a64684de..34f208df 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -3858,6 +3858,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { String machineNum = acceptTodoInfoReq.getMachineNum(); String stationNum = acceptTodoInfoReq.getStationNum(); String materialNo = acceptTodoInfoReq.getMaterialNo(); + String threeDimensionalPerformer = acceptTodoInfoReq.getThreeDimensionalPerformer(); // 根据事业部(项目承接主体)查询人,相关的人都设置为此用户 LyricVProjectToDM lyricVProjectToDM = lyricVProjectToDmService.lambdaQuery().eq(LyricVProjectToDM::getProjectNum, projectNum).one(); if (ObjectUtils.isEmpty(lyricVProjectToDM)) { @@ -3968,13 +3969,34 @@ public class LyricInternalServiceImpl implements ILyricInternalService { principalDemandRelateMemberReq.setCreator(userId); allMemberList.add(principalDemandRelateMemberReq); - SpdmDemandRelateMemberReq threedDemandRelateMemberReq = new SpdmDemandRelateMemberReq(); - threedDemandRelateMemberReq.setDemandId(uuid); - threedDemandRelateMemberReq.setType(MemberTypeEnum.THREED.getCode()); - threedDemandRelateMemberReq.setUserId(userId); - threedDemandRelateMemberReq.setCreateTime(curDateStr); - threedDemandRelateMemberReq.setCreator(userId); - allMemberList.add(threedDemandRelateMemberReq); + + // 将利元亨的用户工号与userId映射 + Map usernameToUserIdMap = new HashMap<>(); + UserListReq userListReq = new UserListReq(); + userListReq.setTenantId(tenantId); + userListReq.setCurrent(1); + userListReq.setSize(9999); + SdmResponse>> pageDataRespSdmResponse = sysUserFeignClient.listUser(userListReq); + if (pageDataRespSdmResponse.isSuccess() && pageDataRespSdmResponse.getData().getData() != null) { + List userList = pageDataRespSdmResponse.getData().getData(); + usernameToUserIdMap = userList.stream().collect(Collectors.toMap(CIDUserResp::getUsername, CIDUserResp::getUserId)); + } + + + // 根据传的3D负责人字段进行赋值 + if (StringUtils.isNotBlank(threeDimensionalPerformer)) { + Long threeDimensionalPerformerId = usernameToUserIdMap.get(threeDimensionalPerformer); + if (threeDimensionalPerformerId != null) { + SpdmDemandRelateMemberReq threeDemandRelateMemberReq = new SpdmDemandRelateMemberReq(); + threeDemandRelateMemberReq.setDemandId(uuid); + threeDemandRelateMemberReq.setType(MemberTypeEnum.THREED.getCode()); + threeDemandRelateMemberReq.setUserId(userId); + threeDemandRelateMemberReq.setCreateTime(curDateStr); + threeDemandRelateMemberReq.setCreator(userId); + allMemberList.add(threeDemandRelateMemberReq); + } + } + SpdmDemandRelateMemberReq attentionDemandRelateMemberReq = new SpdmDemandRelateMemberReq(); attentionDemandRelateMemberReq.setDemandId(uuid);