[修改] 报告文件批量上传

adc-da-report/src/main/java/com/adc/da/report/eo/ReportFile.java

@@ -1,13 +1,11 @@
 package com.adc.da.report.eo;
 
+import com.adc.da.login.util.UserUtils;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import java.util.List;
 

adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java

@@ -94,7 +94,7 @@ public class TtReportManageAct  {
     /**
      * 文件id
      */
-    @TableField("fileId")
+    @TableField(exist = false)
     private String fileId;
 
 

adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java

@@ -11,7 +11,10 @@ import com.adc.da.report.dao.mysql.ReportLabelDao;
 import com.adc.da.report.eo.*;
 import com.adc.da.report.service.*;
 import com.adc.da.report.util.*;
-import com.adc.da.report.vo.*;
+import com.adc.da.report.vo.ChangeUploaderVo;
+import com.adc.da.report.vo.ReportDetailVo;
+import com.adc.da.report.vo.ReportQueryVo;
+import com.adc.da.report.vo.ReportVo;
 import com.adc.da.sys.dao.mysql.RoleEODao;
 import com.adc.da.sys.dao.mysql.UserEODao;
 import com.adc.da.sys.entity.MenuEO;
@@ -20,7 +23,6 @@ import com.adc.da.sys.entity.RoleEO;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.MenuEOService;
 import com.adc.da.sys.service.OrgEOService;
-import com.adc.da.sys.util.BeanCopyUtils;
 import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
 import com.adc.da.util.utils.CollectionUtils;
@@ -743,11 +745,12 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
         if (reportFiles != null) {
             fileIds = reportFiles.stream().map(ReportFile::getFileId).collect(Collectors.toList());
         }
-        if (CollectionUtils.isNotEmpty(fileIds)) {
-            List<FileEntity> fileEntities = fileDao.selectBatchIds(fileIds);
-            List<FileVo> fileVos = BeanCopyUtils.copyBeanList(fileEntities, FileVo.class);
-            reportDetailVo.setFileList(fileVos);
-        }
+        //TODO  FILE
+//        if (CollectionUtils.isNotEmpty(fileIds)) {
+//            List<FileEntity> fileEntities = fileDao.selectBatchIds(fileIds);
+//            List<FileVo> fileVos = BeanCopyUtils.copyBeanList(fileEntities, FileVo.class);
+//            reportDetailVo.setFileList(fileVos);
+//        }
 
         //设置部门名称
         String department = reportDetailVo.getDepartment();

adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java

@@ -111,8 +111,4 @@ public class ReportDetailVo {
     @TableField(exist = false)
     private List<ReportFile> fileList;
 
-    /**
-     * 文件列表
-     */
-    private List<FileVo> fileList;
 }

adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -23,6 +23,31 @@
     </resultMap>
 
 
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultReportVoMap" type="com.adc.da.report.vo.ReportVo">
+        <result column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="keycontent" property="keyContent" />
+        <result column="maincontent" property="mainContent" />
+        <result column="department" property="department" />
+        <result column="year" property="year" />
+        <result column="confidentialLevel" property="confidentialLevel" />
+        <result column="privacyLevel" property="privacyLevel" />
+        <result column="createUserId" property="createUserId" />
+        <result column="uploader" property="uploader" />
+        <result column="createDate" property="createDate" />
+        <result column="thumbUp" property="thumbUp" />
+        <result column="clicks" property="clicks" />
+        <result column="download" property="download" />
+        <result column="reportRating" property="reportRating" />
+        <result column="isAct" property="isAct" />
+        <collection property="fileList" ofType="com.adc.da.report.eo.ReportFile">
+            <result column="fileId" property="fileId" />
+            <result column="fileName" property="fileName" />
+            <result column="rfId" property="id" />
+        </collection>
+    </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
         id, name, keycontent, maincontent, department, year,  confidentialLevel, privacyLevel,