|
@@ -91,7 +91,7 @@ public class DocManageServiceImpl implements DocManageService {
|
|
@Override
|
|
@Override
|
|
public IPage<DocManageOtherDetailResult> pageOtherDetail(Long paperScanTaskId, Integer pageNumber, Integer pageSize) {
|
|
public IPage<DocManageOtherDetailResult> pageOtherDetail(Long paperScanTaskId, Integer pageNumber, Integer pageSize) {
|
|
QueryWrapper<PaperLibraryOther> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<PaperLibraryOther> queryWrapper = new QueryWrapper<>();
|
|
- queryWrapper.lambda().eq(PaperLibraryOther::getPaperScanTaskId, pageNumber)
|
|
|
|
|
|
+ queryWrapper.lambda().eq(PaperLibraryOther::getPaperScanTaskId, paperScanTaskId)
|
|
.orderByAsc(PaperLibraryOther::getCreateTime);
|
|
.orderByAsc(PaperLibraryOther::getCreateTime);
|
|
Page<PaperLibraryOther> paperLibraryOtherPage = paperLibraryOtherService.page(new Page<>(pageNumber, pageSize), queryWrapper);
|
|
Page<PaperLibraryOther> paperLibraryOtherPage = paperLibraryOtherService.page(new Page<>(pageNumber, pageSize), queryWrapper);
|
|
List<DocManageOtherDetailResult> list = new ArrayList<>();
|
|
List<DocManageOtherDetailResult> list = new ArrayList<>();
|
|
@@ -107,7 +107,7 @@ public class DocManageServiceImpl implements DocManageService {
|
|
// 拼接可访问地址
|
|
// 拼接可访问地址
|
|
fileUrls.add(fileUploadService.filePreview(filePathVo));
|
|
fileUrls.add(fileUploadService.filePreview(filePathVo));
|
|
}
|
|
}
|
|
- docManageOtherDetailResult.setFileName(JSON.toJSONString(fileNames));
|
|
|
|
|
|
+ docManageOtherDetailResult.setFileName(String.join(",", fileNames));
|
|
docManageOtherDetailResult.setFileUrls(fileUrls);
|
|
docManageOtherDetailResult.setFileUrls(fileUrls);
|
|
list.add(docManageOtherDetailResult);
|
|
list.add(docManageOtherDetailResult);
|
|
}
|
|
}
|