Browse Source

1.0.4 优化联调bug

xiaofei 1 year ago
parent
commit
ba27967e7e

+ 2 - 2
paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/DocManageServiceImpl.java

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

+ 1 - 1
paper-library/src/main/java/com/qmth/paper/library/api/DocManageController.java

@@ -119,7 +119,7 @@ public class DocManageController {
     @ApiOperation(value = "其它文件详情")
     @PostMapping("/other_detail")
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result pageDetail(@ApiParam(value = "扫描任务ID") @RequestParam(required = false) Long paperScanTaskId,
+    public Result pageDetail(@ApiParam(value = "扫描任务ID", required = true) @RequestParam Long paperScanTaskId,
                              @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                              @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(docManageService.pageOtherDetail(paperScanTaskId, pageNumber, pageSize));