qhse体系证书查询

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/file/QhseInfoController.java

@@ -139,15 +139,9 @@ public class QhseInfoController {
     @PostMapping("/all/content-file")
     @Operation(summary = "获得QHSE资料库下的所有分类目录及文件")
     @PreAuthorize("@ss.hasPermission('rq:qhse-info:query')")
-    public CommonResult<List<QhseInfoRespVO>> getAllContentFile(@Valid IotInfoPageReqVO pageReqVO) {
+    public CommonResult<PageResult<QhseInfoRespVO>> getAllContentFile(@Valid IotInfoPageReqVO pageReqVO) {
         Long classId = pageReqVO.getClassId();
-        List<QhseInfoRespVO> contentFiles = qhseInfoService.getAllChildContentFile(pageReqVO).stream().filter(e ->{
-            if (StringUtils.isNotBlank(pageReqVO.getAllName())) {
-                return e.getFilename().contains(pageReqVO.getAllName());
-            } else {
-                return true;
-            }
-        }).collect(Collectors.toList());
-        return success(contentFiles);
+        PageResult<QhseInfoDO> allChildContentFile = qhseInfoService.getAllChildContentFile(pageReqVO);
+        return success(BeanUtils.toBean(allChildContentFile, QhseInfoRespVO.class));
     }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/file/QhseInfoService.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author 超级管理员
  */
 public interface QhseInfoService {
-    List<QhseInfoRespVO> getAllChildContentFile(IotInfoPageReqVO pageReqVO);
+    PageResult<QhseInfoDO> getAllChildContentFile(IotInfoPageReqVO pageReqVO);
     List<QhseInfoRespVO> getChildContentFile(Long classId);
     /**
      * 创建QHSE文件资料

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/file/QhseInfoServiceImpl.java

@@ -50,7 +50,7 @@ public class QhseInfoServiceImpl implements QhseInfoService {
     private DeptApi deptApi;
 
     @Override
-    public List<QhseInfoRespVO> getAllChildContentFile(IotInfoPageReqVO pageReqVO) {
+    public PageResult<QhseInfoDO> getAllChildContentFile(IotInfoPageReqVO pageReqVO) {
         List<QhseFileTreeDO> contents = qhseFileTreeService.getChildTreeList(ImmutableList.of(pageReqVO.getClassId()));
 //        if (CollUtil.isNotEmpty(contents)) {
         List<Long> contentIds = contents.stream().map(QhseFileTreeDO::getId).collect(Collectors.toList());
@@ -58,10 +58,9 @@ public class QhseInfoServiceImpl implements QhseInfoService {
         QhseInfoPageReqVO infoPageReqVO = new QhseInfoPageReqVO();
         infoPageReqVO.setPageNo(pageReqVO.getPageNo());
         infoPageReqVO.setPageSize(pageReqVO.getPageSize());
-        List<QhseInfoDO> files = qhseInfoMapper.selectPage(infoPageReqVO, contentIds).getList();
+        PageResult<QhseInfoDO> files = qhseInfoMapper.selectPage(infoPageReqVO, contentIds);
 //        }
-        List<QhseInfoRespVO> infoRespVOS = dealFileVo(contents, files);
-        return infoRespVOS;
+        return files;
     }
 
     @Override