Commit 13d0a983 authored by fangxinjiang's avatar fangxinjiang

入职确认接收和修改合同优化-fxj

parent a33e355b
...@@ -12,6 +12,7 @@ import lombok.Data; ...@@ -12,6 +12,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
/** /**
...@@ -50,7 +51,7 @@ public class TContractPreDetail extends BaseEntity { ...@@ -50,7 +51,7 @@ public class TContractPreDetail extends BaseEntity {
@Length(max = 100, message = "申请人不能超过100个字符") @Length(max = 100, message = "申请人不能超过100个字符")
@ExcelProperty("申请人") @ExcelProperty("申请人")
@Schema(description = "申请人") @Schema(description = "申请人")
private String applicantName; private String createName;
/** /**
* 申请时间 * 申请时间
...@@ -59,16 +60,26 @@ public class TContractPreDetail extends BaseEntity { ...@@ -59,16 +60,26 @@ public class TContractPreDetail extends BaseEntity {
@ExcelAttribute(name = "申请时间") @ExcelAttribute(name = "申请时间")
@ExcelProperty("申请时间") @ExcelProperty("申请时间")
@Schema(description = "申请时间") @Schema(description = "申请时间")
private Date applyTime; private Date createTime;
/** /**
* 档案所在地 * 档案-省
*/ */
@ExcelAttribute(name = "档案所在地", maxLength = 200) @ExcelAttribute(name = "档案-省", maxLength = 32, isDataId = true, isArea = true, parentField = "")
@Length(max = 200, message = "档案所在地不能超过200个字符") @Schema(description = "档案-省", name = "fileProvince")
@ExcelProperty("档案所在地") private Integer fileProvince;
@Schema(description = "档案所在地") /**
private String fileLocation; * 档案-市
*/
@ExcelAttribute(name = "档案-市", maxLength = 32, isDataId = true, isArea = true, parentField = "fileProvince")
@Schema(description = "档案-市", name = "fileCity")
private Integer fileCity;
/**
* 档案-县
*/
@ExcelAttribute(name = "档案-县", maxLength = 32, isDataId = true, isArea = true, parentField = "fileCity")
@Schema(description = "档案-县", name = "fileTown")
private Integer fileTown;
/** /**
* 合同类型 * 合同类型
...@@ -77,7 +88,7 @@ public class TContractPreDetail extends BaseEntity { ...@@ -77,7 +88,7 @@ public class TContractPreDetail extends BaseEntity {
@Length(max = 50, message = "合同类型不能超过50个字符") @Length(max = 50, message = "合同类型不能超过50个字符")
@ExcelProperty("合同类型") @ExcelProperty("合同类型")
@Schema(description = "合同类型") @Schema(description = "合同类型")
private String contractType; private String contractName;
/** /**
* 签订类型 * 签订类型
...@@ -95,25 +106,23 @@ public class TContractPreDetail extends BaseEntity { ...@@ -95,25 +106,23 @@ public class TContractPreDetail extends BaseEntity {
@Length(max = 50, message = "签订期限不能超过50个字符") @Length(max = 50, message = "签订期限不能超过50个字符")
@ExcelProperty("签订期限") @ExcelProperty("签订期限")
@Schema(description = "签订期限") @Schema(description = "签订期限")
private String signTerm; private String contractType;
/** /**
* 合同起始日期 * 合同起始时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @NotBlank(message = "合同起始时间不能为空")
@ExcelAttribute(name = "合同起始日期") @ExcelAttribute(name = "合同起始时间", needExport = true,isNotEmpty = true)
@ExcelProperty("合同起始日期") @Schema(description = "合同起始时间", name = "contractStart")
@Schema(description = "合同起始日期") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date contractStartDate; private Date contractStart;
/** /**
* 合同截止日期 * 合同到期时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @ExcelAttribute(name = "合同到期时间", needExport = true)
@ExcelAttribute(name = "合同截止日期") @Schema(description = "合同到期时间", name = "contractEnd")
@ExcelProperty("合同截止日期") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
@Schema(description = "合同截止日期") private Date contractEnd;
private Date contractEndDate;
/** /**
* 审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败) * 审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)
...@@ -124,15 +133,6 @@ public class TContractPreDetail extends BaseEntity { ...@@ -124,15 +133,6 @@ public class TContractPreDetail extends BaseEntity {
@Schema(description = "审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)") @Schema(description = "审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)")
private String auditStatus; private String auditStatus;
/**
* 合同状态
*/
@ExcelAttribute(name = "合同状态", maxLength = 20)
@Length(max = 20, message = "合同状态不能超过20个字符")
@ExcelProperty("合同状态")
@Schema(description = "合同状态")
private String contractStatus;
/** /**
* 入职确认信息主表id * 入职确认信息主表id
*/ */
......
...@@ -41,7 +41,7 @@ public class TContractPreDetailVo implements Serializable { ...@@ -41,7 +41,7 @@ public class TContractPreDetailVo implements Serializable {
*/ */
@ExcelProperty("申请人") @ExcelProperty("申请人")
@Schema(description = "申请人") @Schema(description = "申请人")
private String applicantName; private String createName;
/** /**
* 申请时间 * 申请时间
...@@ -49,51 +49,65 @@ public class TContractPreDetailVo implements Serializable { ...@@ -49,51 +49,65 @@ public class TContractPreDetailVo implements Serializable {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty("申请时间") @ExcelProperty("申请时间")
@Schema(description = "申请时间") @Schema(description = "申请时间")
private Date applyTime; private Date createTime;
/** /**
* 档案所在地 * 档案-省
*/ */
@ExcelProperty("档案所在地") @ExcelProperty("档案-省")
@Schema(description = "档案所在地") @Schema(description = "档案-省", name = "fileProvince")
private String fileLocation; private Integer fileProvince;
/**
* 档案-市
*/
@ExcelProperty("档案-市")
@Schema(description = "档案-市", name = "fileCity")
private Integer fileCity;
/**
* 档案-县
*/
@ExcelProperty("档案-县")
@Schema(description = "档案-县", name = "fileTown")
private Integer fileTown;
/** /**
* 合同类型 * 合同类型
*/ */
@ExcelProperty("合同类型") @ExcelProperty("合同类型")
@Schema(description = "合同类型") @Schema(description = "合同类型", name = "contractName")
private String contractType; private String contractName;
/** /**
* 签订类型 * 签订类型
*/ */
@ExcelProperty("签订类型") @ExcelProperty("签订类型")
@Schema(description = "签订类型") @Schema(description = "签订类型", name = "signType")
private String signType; private String signType;
/** /**
* 签订期限 * 签订期限
*/ */
@ExcelProperty("签订期限") @ExcelProperty("签订期限")
@Schema(description = "签订期限") @Schema(description = "签订期限", name = "contractType")
private String signTerm; private String contractType;
/** /**
* 合同起始日期 * 合同起始时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty("合同起始日期") @ExcelProperty("合同起始日期")
@Schema(description = "合同起始日期") @Schema(description = "合同起始时间", name = "contractStart")
private Date contractStartDate; private Date contractStart;
/** /**
* 合同截止日期 * 合同到期时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty("合同截止日期") @ExcelProperty("合同截止日期")
@Schema(description = "合同截止日期") @Schema(description = "合同到期时间", name = "contractEnd")
private Date contractEndDate; private Date contractEnd;
/** /**
* 审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败) * 审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)
...@@ -102,13 +116,6 @@ public class TContractPreDetailVo implements Serializable { ...@@ -102,13 +116,6 @@ public class TContractPreDetailVo implements Serializable {
@Schema(description = "审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)") @Schema(description = "审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)")
private String auditStatus; private String auditStatus;
/**
* 合同状态
*/
@ExcelProperty("合同状态")
@Schema(description = "合同状态")
private String contractStatus;
/** /**
* 入职确认信息主表id * 入职确认信息主表id
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment