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

fix[project]: 数据查询修复问题

Browse Source
This commit is contained in:
lidongyang
2026-03-20 16:03:16 +08:00
parent 555d93135c
commit 4eeb169787
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
View File

@@ -61,7 +61,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
List<SpdmTaskVo> getTaskListByDemandId(@Param("demandId") String demandId); List<SpdmTaskVo> getTaskListByDemandId(@Param("demandId") String demandId);
List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeId") String taskNodeId,@Param("disciplineList") List<String> disciplineList); List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeIdList") List<String> taskNodeIdList,@Param("disciplineList") List<String> disciplineList);
List<SpdmTaskVo> getTaskListByIdList(@Param("taskIdList") List<String> taskIdList); List<SpdmTaskVo> getTaskListByIdList(@Param("taskIdList") List<String> taskIdList);

2
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -2167,7 +2167,7 @@ public class TaskServiceImpl implements ITaskService {
req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList()); req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList());
} }
if (StringUtils.isNotBlank(taskNodeId)) { if (StringUtils.isNotBlank(taskNodeId)) {
allTaskVoList = mapper.getAnalysisTask(taskNodeId,req.getDisciplineList()); allTaskVoList = mapper.getAnalysisTask(Arrays.stream(taskNodeId.split(",")).toList(),req.getDisciplineList());
} else { } else {
taskVoList = mapper.taskListByTag(req, tenantId, new ArrayList<>(), pos, limit,userId, taskVoList = mapper.taskListByTag(req, tenantId, new ArrayList<>(), pos, limit,userId,
tag1KeyList,tag2KeyList,tag3KeyList,tag4KeyList,tag5KeyList,tag6KeyList,tag7KeyList tag1KeyList,tag2KeyList,tag3KeyList,tag4KeyList,tag5KeyList,tag6KeyList,tag7KeyList

7
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -801,7 +801,12 @@
</select> </select>
<select id="getAnalysisTask" resultType="com.sdm.project.model.vo.SpdmAnalysisTaskVo"> <select id="getAnalysisTask" resultType="com.sdm.project.model.vo.SpdmAnalysisTaskVo">
select * from simulation_task where uuid = #{taskNodeId} select * from simulation_task where uuid in
(
<foreach collection='taskNodeIdList' item='taskNodeId' index='index' separator=','>
#{taskNodeId}
</foreach>
)
<if test="disciplineList != null and disciplineList.size > 0"> <if test="disciplineList != null and disciplineList.size > 0">
and (discipline in ( and (discipline in (
<foreach collection='disciplineList' item='disciplineId' index='index' separator=','> <foreach collection='disciplineList' item='disciplineId' index='index' separator=','>