1、文件夹分类查询优化修改

src/main/java/com/link/report/controller/query/JimuReportQueryController.java

@@ -28,14 +28,14 @@ public class JimuReportQueryController extends BaseController {
     /**
      * 分页查询已授权list+自己创建的list接口
      *
-     * @param JimuReportListVo
+     * @param reportListVo
      * @return
      */
     @GetMapping("/list")
     @RequiresPermissions(value = {"report:jimuReport:list"})
-    public R<PageInfo<JimuReportListDto>> selectList(JimuReportListVo JimuReportListVo) {
-        PageInfo<JimuReportListDto> JimuReportListDtos = reportQueryService.selectList(JimuReportListVo);
-         return R.ok(JimuReportListDtos);
+    public R<PageInfo<JimuReportListDto>> selectList(JimuReportListVo reportListVo) {
+        PageInfo<JimuReportListDto> JimuReportListDtos = reportQueryService.selectList(reportListVo);
+        return R.ok(JimuReportListDtos);
     }
 
 

src/main/java/com/link/report/domain/dao/JimuReportDao.java

@@ -2,7 +2,6 @@ package com.link.report.domain.dao;
 
 import com.link.report.domain.entity.JimuReport;
 import com.link.report.domain.wq.JimuReportListWq;
-import com.link.report.pojo.request.JimuReportListVo;
 import com.link.report.pojo.response.JimuReportListDto;
 import com.sfa.common.core.web.domain.PageInfo;
 
@@ -13,7 +12,7 @@ public interface JimuReportDao {
 
     Integer selectJimuReportListCount(JimuReportListWq wq);
 
-    PageInfo<JimuReportListDto> selectListAll(JimuReportListVo wq);
+    PageInfo<JimuReportListDto> selectListAll(JimuReportListWq wq);
 
     JimuReport selectById(String reportId);
 }

src/main/java/com/link/report/domain/dao/impl/JimuReportDaoImpl.java

@@ -9,11 +9,9 @@ import com.link.report.domain.entity.JimuReportCategory;
 import com.link.report.domain.mapper.JimuReportCategoryMapper;
 import com.link.report.domain.mapper.JimuReportMapper;
 import com.link.report.domain.wq.JimuReportListWq;
-import com.link.report.pojo.request.JimuReportListVo;
 import com.link.report.pojo.response.JimuReportListDto;
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.common.core.web.page.TableSupport;
-import com.sfa.common.security.utils.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -54,13 +52,11 @@ public class JimuReportDaoImpl implements JimuReportDao {
     }
 
     @Override
-    public PageInfo<JimuReportListDto> selectListAll(JimuReportListVo vo) {
+    public PageInfo<JimuReportListDto> selectListAll(JimuReportListWq wq) {
 
-        String username = SecurityUtils.getUsername();
         LambdaQueryWrapper<JimuReport> qw = new LambdaQueryWrapper<JimuReport>()
-//                .eq(JimuReport::getCreateBy,username)
-                .eq(ObjectUtil.isNotEmpty(vo.getCategory()),JimuReport::getType,vo.getCategory())
-                .like(ObjectUtil.isNotEmpty(vo.getName()),JimuReport::getName,vo.getName());
+                 .eq(ObjectUtil.isNotEmpty(wq.getCategory()),JimuReport::getType,wq.getCategory())
+                .like(ObjectUtil.isNotEmpty(wq.getName()),JimuReport::getName,wq.getName());
 
         IPage<JimuReport> jimuReportPage = jimuReportMapper.selectPage(TableSupport.pageI(), qw);
         // 转换成DTO 增加目录查询

src/main/java/com/link/report/domain/wq/JimuReportListWq.java

@@ -8,12 +8,12 @@ import lombok.Data;
  */
 @Data
 public class JimuReportListWq {
-
     private String name;
     private String categoryName;
+    private String category;
     private Integer skipNum;
+    private Integer pageNum;
     private Integer pageSize;
     private String userName;
     private Long userId;
-
 }

src/main/java/com/link/report/pojo/request/JimuReportListVo.java

@@ -12,6 +12,6 @@ public class JimuReportListVo {
     private String name;
     private String categoryName;
     private String category;
-    private Integer skipNum;
+    private Integer pageNum;
     private Integer pageSize;
 }

src/main/java/com/link/report/service/query/JimuReportQueryService.java

@@ -5,7 +5,7 @@ import com.link.report.pojo.response.JimuReportListDto;
 import com.sfa.common.core.web.domain.PageInfo;
 
 public interface JimuReportQueryService {
-    PageInfo<JimuReportListDto> selectList(JimuReportListVo JimuReportListDto);
+    PageInfo<JimuReportListDto> selectList(JimuReportListVo reportListVo);
 
-    PageInfo<JimuReportListDto> selectListAll(JimuReportListVo JimuReportListVo);
+    PageInfo<JimuReportListDto> selectListAll(JimuReportListVo reportListVo);
 }

src/main/java/com/link/report/service/query/impl/JimuReportQueryServiceImpl.java

@@ -25,15 +25,15 @@ public class JimuReportQueryServiceImpl implements JimuReportQueryService {
     /**
      * 分页查询已授权list+自己创建的list
      *
-     * @param jimuReportListVo
+     * @param reportListVo
      * @return
      */
     @Override
-    public PageInfo<JimuReportListDto> selectList(JimuReportListVo jimuReportListVo) {
+    public PageInfo<JimuReportListDto> selectList(JimuReportListVo reportListVo) {
         PageInfo<JimuReportListDto> pageInfo = TableSupport.pageInfo();
         JimuReportListWq wq = new JimuReportListWq();
-        BeanUtils.copyProperties(jimuReportListVo, wq);
-        wq.setSkipNum(pageInfo.getSkipNum());
+        BeanUtils.copyProperties(reportListVo, wq);
+        wq.setPageNum(pageInfo.getSkipNum());
         wq.setPageSize(pageInfo.getPageSize());
 
         String username = SecurityUtils.getUsername();
@@ -60,8 +60,10 @@ public class JimuReportQueryServiceImpl implements JimuReportQueryService {
     }
 
     @Override
-    public PageInfo<JimuReportListDto> selectListAll(JimuReportListVo jimuReportListVo) {
-        PageInfo<JimuReportListDto> list =  jimuReportDao.selectListAll(jimuReportListVo);
+    public PageInfo<JimuReportListDto> selectListAll(JimuReportListVo reportListVo) {
+        JimuReportListWq wq = new JimuReportListWq();
+        BeanUtils.copyProperties(reportListVo, wq);
+        PageInfo<JimuReportListDto> list =  jimuReportDao.selectListAll(wq);
         return list;
     }
 }

src/main/resources/mapper/report/JimuReportMapper.xml

@@ -38,6 +38,9 @@
                 <if test="categoryName != null and categoryName != ''">
                     jrc.name = #{categoryName}
                 </if>
+                <if test="category != null and category != ''">
+                    jr.type = #{category}
+                </if>
                 <if test="name != null and name != ''">
                     and jr.name like concat('%', #{name}, '%')
                 </if>