fix:工位排序

This commit is contained in:
2026-03-18 16:28:50 +08:00
parent f479a02569
commit 1a0e9fd45c
2 changed files with 4 additions and 7 deletions

View File

@@ -1,13 +1,10 @@
package com.sdm.common.entity.req.data;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.sdm.common.entity.enums.FileBizTypeEnum;
import com.sdm.common.entity.req.system.DictTagReq;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -66,10 +63,10 @@ public class GetSimulationTaskFileReq extends BaseReq {
private TagReq tagReq;
@Schema(description = "排序字段名(如: tag1Name、tag2Name...taskName、runName")
private String orderBy;
private String filterKey;
@Schema(description = "排序类型Asc/Desc")
private String orderType;
private String filterType;
@Schema(description = "所属学科名称")
private String ownDisciplineName;

View File

@@ -175,7 +175,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
wrapper.in(FileMetadataInfo::getParentId, taskLevelParentDirIds);
}
if (ObjectUtils.isEmpty(req.getOrderBy())) {
if (ObjectUtils.isEmpty(req.getFilterKey())) {
wrapper.orderByDesc(FileMetadataInfo::getCreateTime);
}
@@ -191,7 +191,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
// 填充文件类型标签信息
fileDictTagQueryService.fillFileTagsForRespList(finalResultList, SimulationTaskResultCurveResp::getId);
sortByTagFieldInCurrentPage(finalResultList, req.getOrderBy(), req.getOrderType());
sortByTagFieldInCurrentPage(finalResultList, req.getFilterKey(), req.getFilterType());
PageInfo<SimulationTaskResultCurveResp> pageInfo = null;