fix:数据查询支持tagReq查询

This commit is contained in:
2026-03-13 09:22:21 +08:00
parent 56e2b649a6
commit a808d2e20f

View File

@@ -68,8 +68,14 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
@Override
public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(GetSimulationTaskFileReq req) {
// level=task 保留现有目录直查逻辑
if (NodeTypeEnum.TASK.getValue().equals(req.getLevel())) {
// level=task,或者tagReq不为空且tagReq.taskId不为空且tagReq.runId为空查询工况下的文件
if (NodeTypeEnum.TASK.getValue().equals(req.getLevel()) ||
(
ObjectUtils.isNotEmpty(req.getTagReq())
&& ObjectUtils.isNotEmpty(req.getTagReq().getTaskId())
&& ObjectUtils.isEmpty(req.getTagReq().getRunId())
)) {
Long taskDirId = resolveTaskDirId(req);
if (ObjectUtils.isEmpty(taskDirId)) {
return PageUtils.getJsonObjectSdmResponse(new ArrayList<>(), new PageInfo<>());
@@ -225,7 +231,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
if (i > 0) {
q.or();
}
q.and(one -> one.eq(column, value).or().likeLeft(column, "," + value));
q.eq(column, value).or().likeLeft(column, "," + value);
}
});
}