1、需求、项目、任务列表接口新增extras字段

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<SimulationTask> {
 
     List<UserGroupDifficultyVo> getUserDifficultyStatistics(@Param("req") UserDifficultCompleteStatisticsReq req);
 
+    List<TaskNodeExtraPo> getTaskExtraList(@Param("taskIdList") List<String> taskIdList);
+
 }

project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java

@@ -87,6 +87,8 @@ public class SpdmDemandVo extends BaseEntity {
      */
     private List<SpdmDemandExtraVo> extraList;
 
+    private List<SpdmDemandExtraVo> extras;
+
     /**
      * 项目名称
      */

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<TaskNodeExtraPo> extras;
+
 }

project/src/main/java/com/sdm/project/model/vo/SpdmNodeVo.java

@@ -80,6 +80,8 @@ public class SpdmNodeVo extends BaseEntity {
      */
     private List<SpdmNodeExtraVo> extraList;
 
+    private List<SpdmNodeExtraVo> extras;
+
     /**
      * 项目详情图片
      */

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);

project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java

@@ -318,7 +318,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
                 nodeId = nodeExtraEntry.getKey();
                 for (SpdmNodeVo spdmNodeVo : nodeList) {
                     if (nodeId.equals(spdmNodeVo.getUuid())) {
-                        spdmNodeVo.setExtraList(nodeExtraEntry.getValue());
+                        spdmNodeVo.setExtras(nodeExtraEntry.getValue());
                     }
                 }
             }

project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java

@@ -450,6 +450,11 @@ public class TaskServiceImpl implements ITaskService {
             setPMemberList(task, copyTaskMemberList);
             setEMemberList(task, copyTaskMemberList);
         }
+        List<TaskNodeExtraPo> taskExtraList = mapper.getTaskExtraList(taskIdList);
+        Map<String, List<TaskNodeExtraPo>> taskExtraMap = Map.of();
+        if (CollectionUtils.isNotEmpty(taskExtraList)) {
+            taskExtraMap = taskExtraList.stream().collect(Collectors.groupingBy(TaskNodeExtraPo::getTaskId));
+        }
         List<SpdmNewTaskVo> 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);

project/src/main/resources/mapper/SimulationTaskMapper.xml

@@ -309,5 +309,14 @@
         </where>
     </select>
 
+    <select id="getTaskExtraList" resultType="com.sdm.project.model.po.TaskNodeExtraPo">
+        select * from simulation_task_extra where task_id  in
+        (
+        <foreach collection='taskIdList' item='taskId' index='index' separator=','>
+            #{taskId}
+        </foreach>
+        )
+    </select>
+
 
 </mapper>