DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

进度+文件上传重构+文件权限控制

Browse Source
This commit is contained in:
hdka
2025-05-10 22:17:04 +08:00
parent ca3724ff32
commit 9825e0ba1d
49 changed files with 758 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectScheduleStep.java
View File

@@ -76,4 +76,12 @@ public class OaProjectScheduleStep extends BaseEntity {
@TableLogic
private String delFlag;
/**
* 使用标志
*/
private Long useFlag;
private Long batchId;
}

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java
View File

@@ -3,9 +3,6 @@ package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;

26
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOssAcl.java Normal file
View File

@@ -0,0 +1,26 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@TableName("sys_oss_acl")
public class SysOssAcl {
/** 主键 */
@TableId(type = IdType.AUTO)
private Long aclId;
/** 文件 ID */
private Long ossId;
/** 被授权用户 */
private Long userId;
/** 授权人 */
private Long grantBy;
/** 授权时间 */
private LocalDateTime grantTime;
}

13
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/BatchBo.java Normal file
View File

@@ -0,0 +1,13 @@
package com.ruoyi.oa.domain.bo;
import lombok.Data;
import java.util.List;
@Data
public class BatchBo {
private Long currentStep;
private List<OaProjectScheduleStepBo> boList;
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleStepBo.java
View File

@@ -91,4 +91,11 @@ public class OaProjectScheduleStepBo extends BaseEntity {
*/
private String header;
/**
* 使用标志
*/
private Long useFlag;
private Long batchId;
}

12
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OssUserBo.java Normal file
View File

@@ -0,0 +1,12 @@
package com.ruoyi.oa.domain.bo;
import lombok.Data;
@Data
public class OssUserBo {
private Long ossId;
private String userIds;
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaClaimBo.java
View File

@@ -1,10 +1,7 @@
package com.ruoyi.oa.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.oa.domain.SysOaClaimDetail;
import com.ruoyi.oa.domain.SysOaFile;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseDetailBo.java
View File

@@ -63,4 +63,7 @@ public class SysOaWarehouseDetailBo extends BaseEntity {
private Double signPrice;
private Long masterId;
// 当为1的时候为入库单
private Long type;
}

10
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleStepVo.java
View File

@@ -97,4 +97,14 @@ public class OaProjectScheduleStepVo {
/** 附件列表（1 步骤可多附件） */
private List<SysOss> fileList; // 建议用 List
/**
* 使用标志
*/
private Long useFlag;
/**
* 批次号
*/
private Long batchId;
}

51
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFileVo.java
View File

@@ -1,51 +0,0 @@
package com.ruoyi.oa.domain.vo;
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.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 文件存储视图对象 sys_oa_file
*
* @author hdka
* @date 2024-12-15
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaFileVo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long fileId;
/**
* 文件存储路径
*/
@ExcelProperty(value = "文件存储路径")
private String fileUrl;
/**
* 文件类型0打卡1出入库
*/
@ExcelProperty(value = "文件类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "file_status")
private Long status;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}