diff --git a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java index 4e098f57..c25d7eba 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java @@ -221,9 +221,9 @@ public class SimulationNodeController implements ISimulationNodeFeignClient { /** * 基于节点(工位)查询(任务/指标)完成统计, * 需要传: - * queryType 查询统计类型 task/ + * queryType 查询统计类型 任务/指标:task/performance * tag1-tag10 标签 - * resultTagType 数据返回Tag类型: tag1、tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10 + * resultTagType X轴(工位对应的tag)数据返回对应的Tag类型: tag1、tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10 */ @SysLog("任务/指标 完成情况统计请求参数(工位)") @PostMapping("/getCommonCompleteStatistics") 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 0f6410b3..faf13c71 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 @@ -1115,8 +1115,11 @@ public class SimulationRunServiceImpl extends ServiceImpl>> listSimulationKeyResult(KeyResultReq req) { PageHelper.startPage(req.getCurrent(), req.getSize()); - List runKeyResults = simulationKeyResultService.lambdaQuery().eq(SimulationRunKeyResult::getRunId, req.getRunId()) - .eq(SimulationRunKeyResult::getKeyResultType, req.getKeyResultType()).list(); + 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()) + .list(); PageInfo page = new PageInfo<>(runKeyResults); return PageUtils.getJsonObjectSdmResponse(runKeyResults, page); }