Commit f41f2495 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 3ea592db
...@@ -53,6 +53,7 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -53,6 +53,7 @@ public class TEmployeeContractPre extends BaseEntity {
private String position; private String position;
@Schema(description = "入职日期") @Schema(description = "入职日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date joinLeaveDate; private Date joinLeaveDate;
@Schema(description = "合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同") @Schema(description = "合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同")
...@@ -96,17 +97,19 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -96,17 +97,19 @@ public class TEmployeeContractPre extends BaseEntity {
* 预计确认时间 * 预计确认时间
*/ */
@Schema(description = "预计确认时间") @Schema(description = "预计确认时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private LocalDateTime expectedConfirmTime; private LocalDateTime expectedConfirmTime;
@Schema(description = "预计发起时间") @Schema(description = "预计发起时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private LocalDateTime expectedCollectionTime; private LocalDateTime expectedCollectionTime;
@Schema(description = "合同起始时间") @Schema(description = "合同起始时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date contractStart; private Date contractStart;
@Schema(description = "合同到期时间") @Schema(description = "合同到期时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date contractEnd; private Date contractEnd;
@Schema(description = "签订类型") @Schema(description = "签订类型")
...@@ -122,9 +125,11 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -122,9 +125,11 @@ public class TEmployeeContractPre extends BaseEntity {
private String contractDurationMonth; private String contractDurationMonth;
@Schema(description = "合同试用期开始时间") @Schema(description = "合同试用期开始时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date tryPeriodStart; private Date tryPeriodStart;
@Schema(description = "合同试用期结束时间") @Schema(description = "合同试用期结束时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date tryPeriodEnd; private Date tryPeriodEnd;
@Schema(description = "工作任务") @Schema(description = "工作任务")
......
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