Эх сурвалжийг харах

解决查询记录总条件报错相关问题

wukai 1 жил өмнө
parent
commit
ecd1a41225

+ 3 - 11
doc-biz/src/main/java/com/doc/biz/controller/DocInfoController.java

@@ -5,7 +5,6 @@ import com.doc.biz.domain.DocInfo;
 import com.doc.biz.domain.DocRecent;
 import com.doc.biz.domain.DocSpace;
 import com.doc.biz.service.*;
-import com.doc.biz.vo.DocInfoVO;
 import com.doc.biz.vo.DocumentVO;
 import com.doc.common.annotation.Log;
 import com.doc.common.config.EsConfig;
@@ -17,7 +16,6 @@ import com.doc.common.enums.BusinessType;
 import com.doc.common.enums.EventLevel;
 import com.doc.common.utils.DateUtils;
 import com.doc.common.utils.SecurityUtils;
-import com.doc.common.utils.bean.BeanUtils;
 import com.doc.common.utils.file.FileUtils;
 import com.doc.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
@@ -272,17 +270,11 @@ public class DocInfoController extends BaseController {
         }
         startPage();
         List<DocInfo> list = docInfoService.selectDocInfoList(docInfo);
-        List<DocInfoVO> result = new ArrayList<>();
         list.forEach(info -> {
-            DocInfoVO vo = new DocInfoVO();
-            BeanUtils.copyProperties(info, vo);
-
-            vo.setDir(dirMap.get(vo.getDirId()));
-            vo.setSpace(spaceMap.get(vo.getSpaceId()));
-
-            result.add(vo);
+            info.setDir(dirMap.get(info.getDirId()));
+            info.setSpace(spaceMap.get(info.getSpaceId()));
         });
-        return getDataTable(result);
+        return getDataTable(list);
     }
 
     /**

+ 8 - 0
doc-biz/src/main/java/com/doc/biz/domain/DocInfo.java

@@ -78,4 +78,12 @@ public class DocInfo extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @TableField(exist = false)
     private Date filedTime;
+
+    @ApiModelProperty("空间信息")
+    @TableField(exist = false)
+    private DocSpace space;
+
+    @TableField(exist = false)
+    @ApiModelProperty("目录信息")
+    private DocDir dir;
 }

+ 0 - 66
doc-biz/src/main/java/com/doc/biz/vo/DocInfoVO.java

@@ -1,66 +0,0 @@
-package com.doc.biz.vo;
-
-import com.doc.biz.domain.DocDir;
-import com.doc.biz.domain.DocSpace;
-import com.doc.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 文件基本信息表对象 doc_info
- *
- * @author wukai
- * @date 2023-08-21
- */
-@ApiModel(value = "DocInfoVO", description = "文件信息表")
-@Data
-public class DocInfoVO extends BaseEntity {
-    /**
-     * 文件ID
-     */
-    @ApiModelProperty("文档ID")
-    private Long docId;
-
-    /**
-     * 空间ID
-     */
-    @ApiModelProperty("空间ID")
-    private Long spaceId;
-
-    @ApiModelProperty("空间信息")
-    private DocSpace space;
-
-    /**
-     * 目录ID
-     */
-    @ApiModelProperty("目录ID")
-    private Long dirId;
-
-    @ApiModelProperty("目录信息")
-    private DocDir dir;
-
-    /**
-     * 文件名称
-     */
-    @ApiModelProperty("文件名称")
-    private String fileName;
-
-    /**
-     * 文件ID
-     */
-    @ApiModelProperty("文件ID")
-    private String fileId;
-
-    /**
-     * 文件大小
-     */
-    @ApiModelProperty("文件大小")
-    private Long fileSize;
-
-    /**
-     * 文件类型
-     */
-    @ApiModelProperty("文件类型")
-    private String fileType;
-}