diff --git a/1-sql/2026-03-26/simulation_run_key_result.sql b/1-sql/2026-03-26/simulation_run_key_result.sql new file mode 100644 index 00000000..673c0870 --- /dev/null +++ b/1-sql/2026-03-26/simulation_run_key_result.sql @@ -0,0 +1 @@ +ALTER TABLE spdm_baseline.simulation_run_key_result ADD taskId varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' NULL COMMENT '所属TASK UUID'; \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java b/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java index e5b1b117..8ac8e64c 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationRunKeyResult.java @@ -33,6 +33,10 @@ public class SimulationRunKeyResult implements Serializable { @ApiModelProperty(value = "所属Run UUID", required = true) private String runId; + @TableField("taskId") + @ApiModelProperty(value = "所属Task UUID", required = true) + private String taskId; + @TableField("keyResultType") @ApiModelProperty(value = "关键性能结果类型 1-图片/动画 2-曲线 3-报告 4-数值") private Integer keyResultType; diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index d9141ea8..d5ba3724 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -1136,8 +1136,14 @@ public class SimulationRunServiceImpl extends ServiceImpl>> listSimulationKeyResult(KeyResultReq req) { PageHelper.startPage(req.getCurrent(), req.getSize()); - List runKeyResults = simulationKeyResultService.lambdaQuery() - .eq(ObjectUtils.isNotEmpty(req.getRunId()),SimulationRunKeyResult::getRunId, req.getRunId()) - .eq(ObjectUtils.isNotEmpty(req.getKeyResultType()),SimulationRunKeyResult::getKeyResultType, req.getKeyResultType()) - .eq(ObjectUtils.isNotEmpty(req.getFileId()),SimulationRunKeyResult::getFileId, req.getFileId()) - .orderByAsc(SimulationRunKeyResult::getFileId) - .list(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(req.getRunId())) { + queryWrapper.eq(SimulationRunKeyResult::getRunId, req.getRunId()); + } + if (StringUtils.isNotBlank(req.getTaskId())) { + queryWrapper.eq(SimulationRunKeyResult::getTaskId, req.getTaskId()); + } + if (ObjectUtils.isNotEmpty(req.getKeyResultType())) { + queryWrapper.eq(SimulationRunKeyResult::getKeyResultType, req.getKeyResultType()); + } + if (ObjectUtils.isNotEmpty(req.getFileId())) { + queryWrapper.eq(SimulationRunKeyResult::getFileId, req.getFileId()); + } + queryWrapper.orderByAsc(SimulationRunKeyResult::getFileId); + List runKeyResults = simulationKeyResultService.getBaseMapper().selectList(queryWrapper); + PageInfo page = new PageInfo<>(runKeyResults); // 批量查询文件信息并回设name @@ -2936,6 +2953,7 @@ public class SimulationRunServiceImpl extends ServiceImpl