合并分支 'qa' 到 'master'

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

@@ -39,6 +39,19 @@ public class JimuReportQueryController extends BaseController {
     }
 
 
+    /**
+     * 分页查询已授权可以编辑的list
+     * @param reportListVo
+     * @return
+     */
+    @GetMapping("/edit/list")
+    @RequiresPermissions(value = {"report:jimuReport:editList"})
+    public R<PageInfo<JimuReportListDto>> selectEditList(JimuReportListVo reportListVo) {
+        PageInfo<JimuReportListDto> JimuReportListDtos = reportQueryService.selectList(reportListVo);
+        return R.ok(JimuReportListDtos);
+    }
+
+
     /**
      * 分页查询所有的报表接口
      *

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

@@ -26,7 +26,8 @@ public class JimuReportCategoryQueryDaoImpl implements JimuReportCategoryQueryDa
     @Override
     public List<JimuReportCategory> queryList(JimuReportCategory category) {
         Wrapper<JimuReportCategory> wq  = new LambdaQueryWrapper<JimuReportCategory>()
-                .eq(ObjectUtil.isNotEmpty(category.getId()), JimuReportCategory::getId, category.getId());
+                .eq(ObjectUtil.isNotEmpty(category.getId()), JimuReportCategory::getId, category.getId())
+                .eq(ObjectUtil.isNotEmpty(category.getSourceType()),JimuReportCategory::getSourceType,category.getSourceType());
         List<JimuReportCategory> jimuReportCategories = jimuReportCategoryMapper.selectList(wq);
         return jimuReportCategories;
     }

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

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.link.report.domain.dao.JimuReportDao;
 import com.link.report.domain.entity.JimuReport;
 import com.link.report.domain.entity.JimuReportCategory;
+import com.link.report.domain.entity.JimuReportShareBi;
 import com.link.report.domain.mapper.JimuReportCategoryMapper;
 import com.link.report.domain.mapper.JimuReportMapper;
+import com.link.report.domain.mapper.JimuReportShareBiMapper;
 import com.link.report.domain.wq.JimuReportListWq;
 import com.link.report.pojo.response.JimuReportListDto;
 import com.sfa.common.core.web.domain.PageInfo;
@@ -32,6 +34,8 @@ public class JimuReportDaoImpl implements JimuReportDao {
     private JimuReportMapper jimuReportMapper;
     @Autowired
     private JimuReportCategoryMapper jimuReportCategoryMapper;
+    @Autowired
+    private JimuReportShareBiMapper shareMapper;
 
 
     /**
@@ -56,6 +60,7 @@ public class JimuReportDaoImpl implements JimuReportDao {
     public PageInfo<JimuReportListDto> selectListAll(JimuReportListWq wq) {
 
         LambdaQueryWrapper<JimuReport> qw = new LambdaQueryWrapper<JimuReport>()
+                .eq(JimuReport::getDelFlag,0)
                  .eq(ObjectUtil.isNotEmpty(wq.getCategory()) && !StringUtils.equals(wq.getCategory(),"0"),JimuReport::getType,wq.getCategory())
                 .like(ObjectUtil.isNotEmpty(wq.getName()),JimuReport::getName,wq.getName());
 
@@ -74,7 +79,13 @@ public class JimuReportDaoImpl implements JimuReportDao {
                 jimuReportListDto.setCategory(jimuReportCategory.getId());
                 jimuReportListDto.setCategoryName(jimuReportCategory.getName());
             }
-
+            LambdaQueryWrapper<JimuReportShareBi> eq = new LambdaQueryWrapper<JimuReportShareBi>()
+                    .eq(JimuReportShareBi::getReportId, jimuReport.getId());
+            JimuReportShareBi jimuReportShareBi = shareMapper.selectOne(eq);
+            if(ObjectUtil.isNotEmpty(jimuReportShareBi)){
+                jimuReportListDto.setPreviewUrl(jimuReportShareBi.getPreviewUrl());
+                jimuReportListDto.setHasShare(true);
+            }
             jimuReportListDtos.add(jimuReportListDto);
         }
 

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

 package com.link.report.domain.dao.impl;
 
 import com.link.report.domain.dao.ReportShareDao;
-import com.link.report.domain.mapper.ReportShareBiMapper;
+import com.link.report.domain.mapper.JimuReportShareBiMapper;
 import com.link.report.domain.wq.ReportShareListWq;
 import com.link.report.pojo.response.ReportShareBiListDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@ import java.util.List;
 @Component
 public class ReportShareDaoImpl  implements ReportShareDao {
     @Autowired
-    private ReportShareBiMapper reportShareMapper;
+    private JimuReportShareBiMapper reportShareMapper;
     @Override
     public List<ReportShareBiListDto> selectList(ReportShareListWq reportShareListWq) {
         // 查询数据

src/main/java/com/link/report/domain/entity/JimuReportCategory.java

@@ -37,7 +37,7 @@ public class JimuReportCategory implements Serializable {
     /**
      * 来源类型(report 积木报表 screen 大屏 drag 仪表盘)
      */
-    private String sourceType;
+    private String sourceType = "report";
 
     /**
      * 创建人

src/main/java/com/link/report/domain/mapper/ReportShareBiMapper.java → src/main/java/com/link/report/domain/mapper/JimuReportShareBiMapper.java

@@ -11,6 +11,6 @@ import java.util.List;
 
 @Mapper
 @Repository
-public interface ReportShareBiMapper extends BaseMapper<JimuReportShareBi> {
+public interface JimuReportShareBiMapper extends BaseMapper<JimuReportShareBi> {
     List<ReportShareBiListDto> selectShareList(ReportShareListWq reportShareListWq);
 }

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

@@ -11,4 +11,6 @@ import lombok.Data;
 public class JimuReportCategoryVo {
     private String id;
     private String name;
+    private String sourceType;
+
 }

src/main/java/com/link/report/pojo/response/JimuReportListDto.java

 package com.link.report.pojo.response;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author : lvbencai
  * @date : 2025年02月14日15:17:07
@@ -17,8 +21,15 @@ public class JimuReportListDto {
     private String category;
     private String categoryName;
     private String createBy;
-    private String createTime;
-
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    private String previewUrl;
+    private Boolean hasShare =false;
 
+    public Boolean getHasShare() {
+        if(ObjectUtil.isNotEmpty(previewUrl)){
+            return  true;
+        }
+        return false;
+    }
 }

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

@@ -38,7 +38,7 @@ public class JimuReportQueryServiceImpl implements JimuReportQueryService {
 
         String username = SecurityUtils.getUsername();
         Long userId = SecurityUtils.getUserId();
-//        admin能看到所有数据
+        // admin能看到所有数据
         if(!SecurityUtils.isAdmin(userId)){
             wq.setUserName(username);
         }

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

@@ -59,13 +59,14 @@
     </select>
 
     <select id="selectJimuReportList" resultType="com.link.report.pojo.response.JimuReportListDto">
-     select distinct  id, name ,code,   category ,   categoryName,  createBy,createTime
+     select distinct  id, name ,code,   category ,   categoryName,  createBy,createTime,previewUrl
      from (
 
         select jr.id, jr.name ,jr.code,
         jr.type as category ,jrc.name as categoryName,
-        jr.create_by as createBy,jr.create_time as createTime
+        jr.create_by as createBy,jr.create_time as createTime,jrsh.preview_url as previewUrl
         from jimu_report jr
+         left join jimu_report_share jrsh on jr.id = jrsh.report_id
         left join jimu_report_category jrc on jr.type = jrc.id
         <where>
             jr.del_flag =0
@@ -92,8 +93,9 @@
             union
             select jr.id, jr.name ,jr.code,
             jr.type as category ,jrc.name as categoryName,
-            jr.create_by as createBy,jr.create_time as createTime
+            jr.create_by as createBy,jr.create_time as createTime,jrsh.preview_url as previewUrl
             from jimu_report jr
+            left join jimu_report_share jrsh on jr.id = jrsh.report_id
             left join jimu_report_category jrc on jr.type = jrc.id
             inner join jimu_report_auth jra on jr.id = jra.report_id
             <where>
@@ -105,6 +107,9 @@
                 <if test="name != null and name != ''">
                     and jr.name like concat('%', #{name}, '%')
                 </if>
+                <if test="category != null and category != '0'">
+                    and jr.type = #{category}
+                </if>
             </where>
         </if>
 

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

@@ -2,7 +2,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.link.report.domain.mapper.ReportShareBiMapper">
+<mapper namespace="com.link.report.domain.mapper.JimuReportShareBiMapper">
     <!-- 定义 ResultMap，将数据库表字段映射到 Java 对象属性 -->
     <resultMap id="ReportShareResultMap" type="com.link.report.domain.entity.JimuReportShareBi">
         <id property="id" column="id"/>