Commit 82634100 authored by huyuchen's avatar huyuchen

huyc 项目档案代码提交

parent a36de4f8
...@@ -19,10 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo; ...@@ -19,10 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.Past; import javax.validation.constraints.Past;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
...@@ -67,13 +67,13 @@ public class EmployeeProjectExportVO{ ...@@ -67,13 +67,13 @@ public class EmployeeProjectExportVO{
* 身份证有效期起 * 身份证有效期起
*/ */
@ExcelProperty(value = "身份证开始日期") @ExcelProperty(value = "身份证开始日期")
private LocalDateTime validityStart; private LocalDate validityStart;
/** /**
* 身份证有效期止 * 身份证有效期止
*/ */
@ExcelProperty(value = "身份证截止日期") @ExcelProperty(value = "身份证截止日期")
private LocalDateTime validityEnd; private LocalDate validityEnd;
/** /**
* 婚姻状况 * 婚姻状况
...@@ -175,13 +175,13 @@ public class EmployeeProjectExportVO{ ...@@ -175,13 +175,13 @@ public class EmployeeProjectExportVO{
* 入学时间 * 入学时间
*/ */
@ExcelProperty(value = "入学时间") @ExcelProperty(value = "入学时间")
private LocalDateTime admissionDate; private LocalDate admissionDate;
/** /**
* 毕业时间 * 毕业时间
*/ */
@ExcelProperty(value = "毕业时间") @ExcelProperty(value = "毕业时间")
private LocalDateTime gradutionDate; private LocalDate gradutionDate;
/** /**
* 备注 * 备注
...@@ -267,7 +267,7 @@ public class EmployeeProjectExportVO{ ...@@ -267,7 +267,7 @@ public class EmployeeProjectExportVO{
*/ */
@ExcelProperty(value ="入职日期") @ExcelProperty(value ="入职日期")
@Past @Past
private LocalDateTime enjoinDate; private LocalDate enjoinDate;
/** /**
* 试用期(单位月) * 试用期(单位月)
......
...@@ -23,9 +23,8 @@ import lombok.Data; ...@@ -23,9 +23,8 @@ import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Past; import javax.validation.constraints.Past;
import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDate;
/** /**
* 项目档案表excel对应的实体 * 项目档案表excel对应的实体
...@@ -113,7 +112,7 @@ public class EmployeeProjectVO implements Serializable { ...@@ -113,7 +112,7 @@ public class EmployeeProjectVO implements Serializable {
*/ */
@ExcelProperty(value ="入职日期") @ExcelProperty(value ="入职日期")
@Past @Past
private LocalDateTime enjoinDate; private LocalDate enjoinDate;
/** /**
* 试用期(单位月) * 试用期(单位月)
......
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