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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
liuzongkun999
2025-02-21 21:11:14 +08:00
parent e41c27a06b e1aad0580a
commit 55b7003d80
23 changed files with 1717 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaClaim.java Normal file
View File

@@ -0,0 +1,79 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 差旅费报销对象 sys_oa_claim
*
* @author ruoyi
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_oa_claim")
public class SysOaClaim extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "claim_id")
private Long claimId;
/**
* 报销人
*/
private Long userId;
/**
* 票据文件id列表
*/
private String fileIds;
/**
* 报销缘由/备注
*/
private String remark;
/**
* 开始时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 出差天数
*/
private Long tripDays;
/**
* 报销金额
*/
private Double cost;
/**
* 票据总数
*/
private Long detailNumber;
/**
* 关联项目
*/
private Long projectId;
/**
* 删除标志
*/
@TableLogic
private Long delFlag;
/**
* 关联流程id
*/
private String procInsId;
/**
* 报销时间
*/
private Date completedTime;
}

71
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaClaimDetail.java Normal file
View File

@@ -0,0 +1,71 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 报销明细对象 sys_oa_claim_detail
*
* @author hdka
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_oa_claim_detail")
public class SysOaClaimDetail extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "claim_detail_id")
private Long claimDetailId;
/**
* 外键id
*/
private Long claimId;
/**
* 报销类型
*/
private Long claimType;
/**
* 开始时间
*/
private Date beginTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 入住地点
*/
private String lodgingAddress;
/**
* 删除标志
*/
@TableLogic
private Long delFlag;
/**
* 备注
*/
private String remark;
/**
* 文件id列表
*/
private String fileIds;
/**
* 报销金额
*/
private Double cost;
/**
* 报销金额大写
*/
private String bigCost;
}

92
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaClaimBo.java Normal file
View File

@@ -0,0 +1,92 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.oa.domain.SysOaClaimDetail;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 差旅费报销业务对象 sys_oa_claim
*
* @author ruoyi
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaClaimBo extends BaseEntity {
/**
* 主键id
*/
private Long claimId;
/**
* 报销人
*/
private Long userId;
/**
* 票据文件id列表
*/
private String fileIds;
/**
* 报销缘由/备注
*/
private String remark;
/**
* 开始时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 出差天数
*/
private Long tripDays;
/**
* 报销金额
*/
private Double cost;
/**
* 票据总数
*/
private Long detailNumber;
/**
* 关联项目
*/
private Long projectId;
/**
* 关联流程id
*/
private String procInsId;
/**
* 报销时间
*/
private Date completedTime;
/**
* 细节列表
*/
private List<SysOaClaimDetailBo> claimDetailList;
}

85
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaClaimDetailBo.java Normal file
View File

@@ -0,0 +1,85 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 报销明细业务对象 sys_oa_claim_detail
*
* @author hdka
* @date 2025-02-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaClaimDetailBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long claimDetailId;
/**
* 外键id
*/
@NotNull(message = "外键id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long claimId;
/**
* 报销类型
*/
@NotNull(message = "报销类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long claimType;
/**
* 开始时间
*/
@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date beginTime;
/**
* 结束时间
*/
@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date endTime;
/**
* 入住地点
*/
@NotBlank(message = "入住地点不能为空", groups = { AddGroup.class, EditGroup.class })
private String lodgingAddress;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
/**
* 文件id列表
*/
@NotBlank(message = "文件id列表不能为空", groups = { AddGroup.class, EditGroup.class })
private String fileIds;
/**
* 报销金额
*/
@NotNull(message = "报销金额不能为空", groups = { AddGroup.class, EditGroup.class })
private Double cost;
/**
* 报销金额大写
*/
@NotBlank(message = "报销金额大写不能为空", groups = { AddGroup.class, EditGroup.class })
private String bigCost;
}

86
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaClaimDetailVo.java Normal file
View File

@@ -0,0 +1,86 @@
package com.ruoyi.oa.domain.vo;
import java.util.Date;
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 lombok.Data;
/**
* 报销明细视图对象 sys_oa_claim_detail
*
* @author hdka
* @date 2025-02-21
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaClaimDetailVo {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long claimDetailId;
/**
* 外键id
*/
@ExcelProperty(value = "外键id")
private Long claimId;
/**
* 报销类型
*/
@ExcelProperty(value = "报销类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "claim_detail_type")
private Long claimType;
/**
* 开始时间
*/
@ExcelProperty(value = "开始时间")
private Date beginTime;
/**
* 结束时间
*/
@ExcelProperty(value = "结束时间")
private Date endTime;
/**
* 入住地点
*/
@ExcelProperty(value = "入住地点")
private String lodgingAddress;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 文件id列表
*/
@ExcelProperty(value = "文件id列表")
private String fileIds;
/**
* 报销金额
*/
@ExcelProperty(value = "报销金额")
private Double cost;
/**
* 报销金额大写
*/
@ExcelProperty(value = "报销金额大写")
private String bigCost;
}

112
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaClaimVo.java Normal file
View File

@@ -0,0 +1,112 @@
package com.ruoyi.oa.domain.vo;
import java.util.Date;
import java.util.List;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.oa.domain.SysOaClaim;
import com.ruoyi.oa.domain.SysOaFile;
import lombok.Data;
/**
* 差旅费报销视图对象 sys_oa_claim
*
* @author ruoyi
* @date 2025-02-21
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaClaimVo extends SysOaClaim {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long claimId;
/**
* 报销人
*/
@ExcelProperty(value = "报销人")
private Long userId;
/**
* 票据文件id列表
*/
@ExcelProperty(value = "票据文件id列表")
private String fileIds;
/**
* 报销缘由/备注
*/
@ExcelProperty(value = "报销缘由/备注")
private String remark;
/**
* 开始时间
*/
@ExcelProperty(value = "开始时间")
private Date startTime;
/**
* 结束时间
*/
@ExcelProperty(value = "结束时间")
private Date endTime;
/**
* 出差天数
*/
@ExcelProperty(value = "出差天数")
private Long tripDays;
/**
* 报销金额
*/
@ExcelProperty(value = "报销金额")
private Double cost;
/**
* 票据总数
*/
@ExcelProperty(value = "票据总数")
private Long detailNumber;
/**
* 关联项目
*/
@ExcelProperty(value = "关联项目")
private Long projectId;
/**
* 关联流程id
*/
@ExcelProperty(value = "关联流程id")
private String procInsId;
/**
* 报销时间
*/
@ExcelProperty(value = "报销时间")
private Date completedTime;
/**
* 报销细节
*/
private List<SysOaClaimDetailVo> detailList;
/**
* 文件列表
*/
private List<SysOaFile> fileList;
/**
* 任务状态
*/
private Long status;
}