fix:修复仿真知识库修改工况库审批展示内容
This commit is contained in:
@@ -62,6 +62,9 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
|
||||
@Autowired
|
||||
private IFileTagRelService fileTagRelService;
|
||||
|
||||
@Autowired
|
||||
IFileDictTagQueryService fileDictTagQueryService;
|
||||
|
||||
|
||||
@Override
|
||||
public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(GetSimulationTaskFileReq req) {
|
||||
@@ -123,10 +126,14 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
|
||||
if (ObjectUtils.isNotEmpty(file.getFileSize())) {
|
||||
resp.setFormatFileSize(FileSizeUtils.formatFileSize(BigDecimal.valueOf(file.getFileSize())));
|
||||
}
|
||||
|
||||
hierarchyHelper.setTagReqFromFileMetadata(file, resp);
|
||||
return resp;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
// 填充children的文件类型标签信息
|
||||
fileDictTagQueryService.fillFileTagsForRespList(finalResultList, SimulationTaskResultCurveResp::getId);
|
||||
|
||||
sortByTagFieldInCurrentPage(finalResultList, req.getOrderBy(), req.getOrderType());
|
||||
|
||||
PageInfo<SimulationTaskResultCurveResp> pageInfo = new PageInfo<>(finalResultList);
|
||||
@@ -407,6 +414,9 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
|
||||
setTagReqForSimulationResult(finalResultList, fileIdList);
|
||||
fillFormatFileSizeForTaskLevel(finalResultList, fileIdList);
|
||||
|
||||
// 填充children的文件类型标签信息
|
||||
fileDictTagQueryService.fillFileTagsForRespList(finalResultList, SimulationTaskResultCurveResp::getId);
|
||||
|
||||
sortByTagFieldInCurrentPage(finalResultList, req.getOrderBy(), req.getOrderType());
|
||||
List<SimulationTaskResultCurveResp> sortedList = finalResultList.stream()
|
||||
.sorted(
|
||||
|
||||
@@ -53,11 +53,11 @@ public class FileSimulationMappingServiceImpl extends ServiceImpl<FileSimulation
|
||||
fileSimulationMappings.add(fileSimulationMapping);
|
||||
});
|
||||
// 先删除原先所有的文件绑定关系
|
||||
this.lambdaUpdate()
|
||||
/*this.lambdaUpdate()
|
||||
.in(FileSimulationMapping::getFileId, fileIds)
|
||||
.in(FileSimulationMapping::getSimulationPoolId, fileSimulationMappingReq.getSimulationPoolId())
|
||||
.in(FileSimulationMapping::getSimulationPoolVersion, fileSimulationMappingReq.getSimulationPoolVersion())
|
||||
.remove();
|
||||
.remove();*/
|
||||
}
|
||||
this.saveBatch(fileSimulationMappings);
|
||||
return SdmResponse.success();
|
||||
|
||||
Reference in New Issue
Block a user