From 575154ba4cc2cc0b6fe51c1f308862d49cb06c27 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Fri, 5 Dec 2025 17:02:55 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9C=80=E6=B1=82=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9Eextras=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sdm/project/dao/SimulationTaskMapper.java | 3 +++ .../main/java/com/sdm/project/model/vo/SpdmDemandVo.java | 2 ++ .../java/com/sdm/project/model/vo/SpdmNewTaskVo.java | 3 +++ .../main/java/com/sdm/project/model/vo/SpdmNodeVo.java | 2 ++ .../com/sdm/project/service/impl/DemandServiceImpl.java | 2 +- .../com/sdm/project/service/impl/NodeServiceImpl.java | 2 +- .../com/sdm/project/service/impl/TaskServiceImpl.java | 6 ++++++ .../src/main/resources/mapper/SimulationTaskMapper.xml | 9 +++++++++ 8 files changed, 27 insertions(+), 2 deletions(-) diff --git a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java index 26bb5325..851a21db 100644 --- a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java +++ b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java @@ -3,6 +3,7 @@ package com.sdm.project.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.common.common.SdmResponse; import com.sdm.project.model.entity.SimulationTask; +import com.sdm.project.model.po.TaskNodeExtraPo; import com.sdm.project.model.req.SpdmAnalysisTaskListReq; import com.sdm.project.model.req.*; import com.sdm.project.model.vo.*; @@ -47,4 +48,6 @@ public interface SimulationTaskMapper extends BaseMapper { List getUserDifficultyStatistics(@Param("req") UserDifficultCompleteStatisticsReq req); + List getTaskExtraList(@Param("taskIdList") List taskIdList); + } 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 769d2865..58e04905 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 @@ -87,6 +87,8 @@ public class SpdmDemandVo extends BaseEntity { */ private List extraList; + private List extras; + /** * 项目名称 */ 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 136d4f21..32d2dab5 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 @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.sdm.common.entity.pojo.BaseEntity; import com.sdm.common.entity.resp.system.CIDUserResp; +import com.sdm.project.model.po.TaskNodeExtraPo; import lombok.Data; import java.util.List; @@ -147,4 +148,6 @@ public class SpdmNewTaskVo extends BaseEntity { @JsonProperty(value = "tag10") private String tag10; + private List extras; + } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java index 22f9c4b5..20595b7a 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java @@ -80,6 +80,8 @@ public class SpdmNodeVo extends BaseEntity { */ private List extraList; + private List extras; + /** * 项目详情图片 */ diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 7b0a9d18..789ba72d 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -478,7 +478,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService { } } spdmDemandVo.setEMemberList(spdmEUserVoList); - spdmDemandVo.setExtraList(demandExtraMap.get(spdmDemandVo.getUuid())); + spdmDemandVo.setExtras(demandExtraMap.get(spdmDemandVo.getUuid())); } jsonObject.put("data", demandList); return SdmResponse.success(jsonObject); diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index b5b5db83..b04016bd 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -318,7 +318,7 @@ public class NodeServiceImpl extends ServiceImpl taskExtraList = mapper.getTaskExtraList(taskIdList); + Map> taskExtraMap = Map.of(); + if (CollectionUtils.isNotEmpty(taskExtraList)) { + taskExtraMap = taskExtraList.stream().collect(Collectors.groupingBy(TaskNodeExtraPo::getTaskId)); + } List newTaskList = new ArrayList<>(); for (SpdmTaskVo taskVo : taskList) { SpdmNewTaskVo spdmNewTaskVo = new SpdmNewTaskVo(); @@ -466,6 +471,7 @@ public class TaskServiceImpl implements ITaskService { spdmNewTaskVo.setTag10(taskVo.getTag10()); spdmNewTaskVo.setPMemberList(taskVo.getPMemberList()); spdmNewTaskVo.setEMemberList(taskVo.getEMemberList()); + spdmNewTaskVo.setExtras(taskExtraMap.get(taskVo.getUuid())); newTaskList.add(spdmNewTaskVo); } jsonObject.put("data", newTaskList); diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml index 3aec8936..e7a9e44e 100644 --- a/project/src/main/resources/mapper/SimulationTaskMapper.xml +++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml @@ -309,5 +309,14 @@ + + \ No newline at end of file