diff --git a/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java b/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java index 4788c101..ca1c5cf9 100644 --- a/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java +++ b/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java @@ -120,6 +120,16 @@ public class SpdmTaskVo extends BaseEntity { */ private String demandId; + /** + * 关联的需求提出人 + */ + private String submitter; + + /** + * 关联的需求提出人名称 + */ + private String submitterName; + /** * 仿真负责人 */ diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java index 2acc7555..51178ff6 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java @@ -111,6 +111,10 @@ public class SpdmDemandVo extends BaseEntity { private String demandType; private String simType; + /** + * 需求备注 + */ + private String description; /** * 3D负责人 diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java index 6a4c8f5e..521dd5e3 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java @@ -1,5 +1,6 @@ package com.sdm.project.model.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.sdm.common.entity.pojo.BaseEntity; @@ -160,6 +161,16 @@ public class SpdmNewTaskVo extends BaseEntity { */ private String demandName; + /** + * 关联的需求提出人 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long submitter; + + /** + * 关联的需求提出人名称 + */ + private String submitterName; diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 53aed520..f19022a9 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -403,11 +403,13 @@ public class TaskServiceImpl implements ITaskService { if (CollectionUtils.isNotEmpty(taskList)) { List demandIdList = taskList.stream().map(SpdmTaskVo::getDemandId).toList(); Map demandMap = Map.of(); + Map demandSubmitMap = Map.of(); if (CollectionUtils.isNotEmpty(demandIdList)) { // 根据demandId查询demandName List demandVoList = demandMapper.getDemandListById(demandIdList); if (CollectionUtils.isNotEmpty(demandVoList)) { demandMap = demandVoList.stream().collect(Collectors.toMap(SpdmDemandVo::getUuid, SpdmDemandVo::getDemandName)); + demandSubmitMap = demandVoList.stream().collect(Collectors.toMap(SpdmDemandVo::getUuid, SpdmDemandVo::getCreator)); } } for (SpdmTaskVo taskVo : taskList) { @@ -428,6 +430,12 @@ public class TaskServiceImpl implements ITaskService { spdmNewTaskVo.setExtras(taskExtraMap.get(taskVo.getUuid())); if (StringUtils.isNotBlank(spdmNewTaskVo.getDemandId())) { spdmNewTaskVo.setDemandName(demandMap.get(spdmNewTaskVo.getDemandId())); + // 任务列表新增提出人(关联的需求创建人) + spdmNewTaskVo.setSubmitter(demandSubmitMap.get(spdmNewTaskVo.getDemandId())); + SdmResponse cidUserResp = sysUserFeignClient.queryUserDetail(UserQueryReq.builder().userId(userId).build()); + if (ObjectUtils.isNotEmpty(cidUserResp.getData())) { + spdmNewTaskVo.setSubmitterName(cidUserResp.getData().getNickname()); + } } newTaskList.add(spdmNewTaskVo); } @@ -544,11 +552,13 @@ public class TaskServiceImpl implements ITaskService { } List demandIdList = taskList.stream().map(SpdmTaskVo::getDemandId).toList(); Map demandMap = Map.of(); + Map demandSubmitMap = Map.of(); if (CollectionUtils.isNotEmpty(demandIdList)) { // 根据demandId查询demandName List demandVoList = demandMapper.getDemandListById(demandIdList); if (CollectionUtils.isNotEmpty(demandVoList)) { demandMap = demandVoList.stream().collect(Collectors.toMap(SpdmDemandVo::getUuid, SpdmDemandVo::getDemandName)); + demandSubmitMap = demandVoList.stream().collect(Collectors.toMap(SpdmDemandVo::getUuid, SpdmDemandVo::getCreator)); } } for (SpdmTaskVo spdmTaskVo : taskList) { @@ -674,6 +684,12 @@ public class TaskServiceImpl implements ITaskService { spdmNewTaskVo.setExtras(taskExtraMap.get(taskVo.getUuid())); if (StringUtils.isNotBlank(spdmNewTaskVo.getDemandId())) { spdmNewTaskVo.setDemandName(demandMap.get(spdmNewTaskVo.getDemandId())); + // 任务列表新增提出人(关联的需求创建人) + spdmNewTaskVo.setSubmitter(demandSubmitMap.get(spdmNewTaskVo.getDemandId())); + SdmResponse cidUserResp = sysUserFeignClient.queryUserDetail(UserQueryReq.builder().userId(userId).build()); + if (ObjectUtils.isNotEmpty(cidUserResp.getData())) { + spdmNewTaskVo.setSubmitterName(cidUserResp.getData().getNickname()); + } } // 设置工位号 setWorkSpaceNodeCode(spdmNewTaskVo,taskVo,allNodeMap,taskNodeTag);