新增文件预览列表修复了任务显示ossId但是无法现在的情况

新增项目编号索引

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/PrefixCounter.java

@@ -0,0 +1,17 @@
+package com.ruoyi.oa.domain;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_prefix_counter")
+public class PrefixCounter {
+
+    @TableId(value = "prefix", type = IdType.INPUT)
+    private String prefix;     // 主键，用作前缀
+
+    private Long seq;          // 当前序号
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java

@@ -144,4 +144,9 @@ public class SysOaProject extends BaseEntity {
      * 预付款
      */
     private Double prePay;
+
+    /**
+     * 代号类型
+     */
+    private String projectCode;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java

@@ -176,5 +176,10 @@ public class SysOaProjectBo extends BaseEntity {
      * 预付款
      */
     private Double prePay;
+
+    /**
+     * 代号类型
+     */
+    private String projectCode;
 }
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleVo.java

@@ -87,4 +87,6 @@ public class OaProjectScheduleVo {
 
     private String description;
 
+    private String projectCode;
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaContractVo.java

@@ -7,9 +7,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.system.domain.SysOss;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -137,5 +138,5 @@ public class SysOaContractVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
+    private List<SysOss> fileList;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java

@@ -10,6 +10,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.oa.domain.SysOaTask;
+import com.ruoyi.system.domain.SysOss;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -239,4 +240,11 @@ public class SysOaProjectVo {
      * 预付款
      */
     private Double prePay;
+
+    private List<SysOss> fileList;
+    /**
+     * 代号类型
+     */
+    private String projectCode;
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskItemVo.java

@@ -6,11 +6,12 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.system.domain.SysOss;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -110,4 +111,6 @@ public class SysOaTaskItemVo {
 
 
     private String nickName;
-}
+
+    private List<SysOss> itemFileList;
+ }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysOss;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -210,4 +211,6 @@ public class SysOaTaskVo {
     private List<SysOaTaskItemVo> taskItemVoList;
 
     private String files;
+
+    private List<SysOss> fileList;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseDetailVo.java

@@ -67,5 +67,6 @@ public class SysOaWarehouseDetailVo extends BaseEntity {
 
     private String model;
     private String specifications;
+    private String brand;
 
 }