Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
82634100
Commit
82634100
authored
Jun 30, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huyc 项目档案代码提交
parent
a36de4f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
9 deletions
+8
-9
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+6
-6
EmployeeProjectVO.java
...ifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectVO.java
+2
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
82634100
...
...
@@ -19,10 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
javax.validation.constraints.Past
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.util.List
;
...
...
@@ -67,13 +67,13 @@ public class EmployeeProjectExportVO{
* 身份证有效期起
*/
@ExcelProperty
(
value
=
"身份证开始日期"
)
private
LocalDate
Time
validityStart
;
private
LocalDate
validityStart
;
/**
* 身份证有效期止
*/
@ExcelProperty
(
value
=
"身份证截止日期"
)
private
LocalDate
Time
validityEnd
;
private
LocalDate
validityEnd
;
/**
* 婚姻状况
...
...
@@ -175,13 +175,13 @@ public class EmployeeProjectExportVO{
* 入学时间
*/
@ExcelProperty
(
value
=
"入学时间"
)
private
LocalDate
Time
admissionDate
;
private
LocalDate
admissionDate
;
/**
* 毕业时间
*/
@ExcelProperty
(
value
=
"毕业时间"
)
private
LocalDate
Time
gradutionDate
;
private
LocalDate
gradutionDate
;
/**
* 备注
...
...
@@ -267,7 +267,7 @@ public class EmployeeProjectExportVO{
*/
@ExcelProperty
(
value
=
"入职日期"
)
@Past
private
LocalDate
Time
enjoinDate
;
private
LocalDate
enjoinDate
;
/**
* 试用期(单位月)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectVO.java
View file @
82634100
...
...
@@ -23,9 +23,8 @@ import lombok.Data;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Past
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.time.LocalDate
Time
;
import
java.time.LocalDate
;
/**
* 项目档案表excel对应的实体
...
...
@@ -113,7 +112,7 @@ public class EmployeeProjectVO implements Serializable {
*/
@ExcelProperty
(
value
=
"入职日期"
)
@Past
private
LocalDate
Time
enjoinDate
;
private
LocalDate
enjoinDate
;
/**
* 试用期(单位月)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment