DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

协调L3页面，新增合同证书的文件上传逻辑

Browse Source
This commit is contained in:
86156
2025-12-23 15:56:15 +08:00
parent 9f423b26f9
commit 04eace18c4
11 changed files with 577 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-hrm/src/main/java/com/klp/hrm/domain/HrmCertificate.java
View File

@@ -25,6 +25,10 @@ public class HrmCertificate extends BaseEntity implements Serializable {
private Date validFrom;
private Date validTo;
private String remark;
/**
* 证书附件 fileIds（逗号分隔的 OSS ID）
*/
private String fileIds;
@TableLogic
private Integer delFlag;
}

4
klp-hrm/src/main/java/com/klp/hrm/domain/HrmContract.java
View File

@@ -25,6 +25,10 @@ public class HrmContract extends BaseEntity implements Serializable {
private Date endDate;
private String status;
private String remark;
/**
* 合同附件 fileIds（逗号分隔的 OSS ID）
*/
private String fileIds;
@TableLogic
private Integer delFlag;
}

10
klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmCertificateBo.java
View File

@@ -1,8 +1,10 @@
package com.klp.hrm.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -22,7 +24,15 @@ public class HrmCertificateBo extends BaseEntity {
private String certNo;
private String issuedBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date validFrom;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date validTo;
private String remark;
/**
* 证书附件 fileIds（逗号分隔的 OSS ID）
*/
private String fileIds;
}

10
klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmContractBo.java
View File

@@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@Data
@EqualsAndHashCode(callSuper = true)
@@ -21,8 +23,16 @@ public class HrmContractBo extends BaseEntity {
private String contractNo;
private String contractType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate;
private String status;
private String remark;
/**
* 合同附件 fileIds（逗号分隔的 OSS ID）
*/
private String fileIds;
}

7
klp-hrm/src/main/java/com/klp/hrm/domain/vo/HrmCertificateVo.java
View File

@@ -5,6 +5,7 @@ import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@Data
public class HrmCertificateVo implements Serializable {
@@ -21,11 +22,17 @@ public class HrmCertificateVo implements Serializable {
@Excel(name = "颁发机构")
private String issuedBy;
@Excel(name = "有效期开始", width = 20, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date validFrom;
@Excel(name = "有效期结束", width = 20, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date validTo;
@Excel(name = "备注")
private String remark;
/**
* 证书附件 fileIds（逗号分隔的 OSS ID）
*/
private String fileIds;
private String createBy;
private Date createTime;
private String updateBy;

7
klp-hrm/src/main/java/com/klp/hrm/domain/vo/HrmContractVo.java
View File

@@ -5,6 +5,7 @@ import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@Data
public class HrmContractVo implements Serializable {
@@ -19,13 +20,19 @@ public class HrmContractVo implements Serializable {
@Excel(name = "合同类型")
private String contractType;
@Excel(name = "开始日期", width = 20, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startDate;
@Excel(name = "结束日期", width = 20, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endDate;
@Excel(name = "状态")
private String status;
@Excel(name = "备注")
private String remark;
/**
* 合同附件 fileIds（逗号分隔的 OSS ID）
*/
private String fileIds;
private String createBy;
private Date createTime;
private String updateBy;