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
31429be4
You need to sign in or sign up before continuing.
Commit
31429be4
authored
Jul 05, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同-date
parent
9f5748a0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
73 additions
and
73 deletions
+73
-73
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+68
-68
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+5
-5
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
31429be4
...
...
@@ -32,8 +32,8 @@ import org.hibernate.validator.constraints.Length;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.Size
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Set
;
...
...
@@ -53,7 +53,7 @@ public class TEmployeeContractInfo extends BaseEntity {
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"主键"
)
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
...
...
@@ -75,14 +75,14 @@ public class TEmployeeContractInfo extends BaseEntity {
* 员工姓名
*/
@Length
(
max
=
32
,
message
=
"员工姓名不能超过32个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
32
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"员工姓名"
,
name
=
"empName"
)
private
String
empName
;
/**
* 员工身份证号
*/
@Length
(
max
=
32
,
message
=
"员工身份证号不能超过32个字符"
)
@ExcelAttribute
(
name
=
"员工身份证号"
,
maxLength
=
32
,
isIdCard
=
true
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"员工身份证号"
,
maxLength
=
32
,
isIdCard
=
true
,
needExport
=
true
)
@Schema
(
description
=
"员工身份证号"
,
name
=
"empIdcard"
)
private
String
empIdcard
;
/**
...
...
@@ -90,7 +90,7 @@ public class TEmployeeContractInfo extends BaseEntity {
*/
@NotBlank
(
message
=
"合同类型不能为空"
)
@Length
(
max
=
32
,
message
=
"合同类型不能超过32个字符"
)
@ExcelAttribute
(
name
=
"合同类型"
,
isNotEmpty
=
true
,
errorInfo
=
"合同类型不能为空"
,
maxLength
=
32
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"合同类型"
,
isNotEmpty
=
true
,
errorInfo
=
"合同类型不能为空"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"合同类型"
,
name
=
"contractName"
)
private
String
contractName
;
/**
...
...
@@ -101,7 +101,7 @@ public class TEmployeeContractInfo extends BaseEntity {
*/
@NotBlank
(
message
=
"签订期限不能为空"
)
@Length
(
max
=
32
,
message
=
"签订期限不能超过32个字符"
)
@ExcelAttribute
(
name
=
"签订期限"
,
isNotEmpty
=
true
,
errorInfo
=
"签订期限不能为空"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_CONTRACT_TYPE
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"签订期限"
,
isNotEmpty
=
true
,
errorInfo
=
"签订期限不能为空"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_CONTRACT_TYPE
,
needExport
=
true
)
@Schema
(
description
=
"签订期限"
,
name
=
"contractType"
)
private
String
contractType
;
/**
...
...
@@ -110,13 +110,13 @@ public class TEmployeeContractInfo extends BaseEntity {
@NotBlank
(
message
=
"合同起始时间不能为空"
)
@ExcelAttribute
(
name
=
"合同起始时间"
,
isNotEmpty
=
true
,
errorInfo
=
"合同起始时间不能为空"
)
@Schema
(
description
=
"合同起始时间"
,
name
=
"contractStart"
)
private
Local
Date
contractStart
;
private
Date
contractStart
;
/**
* 合同到期时间
*/
@ExcelAttribute
(
name
=
"合同到期时间"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"合同到期时间"
,
needExport
=
true
)
@Schema
(
description
=
"合同到期时间"
,
name
=
"contractEnd"
)
private
Local
Date
contractEnd
;
private
Date
contractEnd
;
/**
* 项目名称
*/
...
...
@@ -136,7 +136,7 @@ public class TEmployeeContractInfo extends BaseEntity {
*/
@NotBlank
(
message
=
"签订类型不能为空"
)
@Length
(
max
=
1
,
message
=
"签订类型不能超过1个字符"
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_SITUATION_TYPE
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_SITUATION_TYPE
)
@Schema
(
description
=
"签订类型(字典)"
,
name
=
"situation"
)
private
String
situation
;
/**
...
...
@@ -210,7 +210,7 @@ public class TEmployeeContractInfo extends BaseEntity {
* 合同岗位
*/
@Length
(
max
=
32
,
message
=
"合同岗位不能超过32个字符"
)
@ExcelAttribute
(
name
=
"合同岗位"
,
maxLength
=
32
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"合同岗位"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"合同岗位"
,
name
=
"post"
)
private
String
post
;
/**
...
...
@@ -233,14 +233,14 @@ public class TEmployeeContractInfo extends BaseEntity {
*/
@NotBlank
(
message
=
"结算主体不能为空"
)
@Length
(
max
=
32
,
message
=
"结算主体不能超过32个字符"
)
@ExcelAttribute
(
name
=
"结算主体"
,
errorInfo
=
"结算主体不能为空"
,
isOrgan
=
true
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"结算主体"
,
errorInfo
=
"结算主体不能为空"
,
isOrgan
=
true
,
maxLength
=
32
)
@Schema
(
description
=
"结算主体"
,
name
=
"settleDomain"
)
private
String
settleDomain
;
/**
* 员工类型
*/
@ExcelAttribute
(
name
=
"员工类型"
,
errorInfo
=
"员工类型不能为空"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_TYPE
)
@ExcelAttribute
(
name
=
"员工类型"
,
errorInfo
=
"员工类型不能为空"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_TYPE
)
@TableField
(
exist
=
false
)
private
String
empType
;
...
...
@@ -276,59 +276,59 @@ public class TEmployeeContractInfo extends BaseEntity {
/**
* 在职状态 0是/1否
*/
@ExcelAttribute
(
name
=
"在职状态"
,
errorInfo
=
"在职状态 0是/1否不能为空"
,
maxLength
=
1
,
isDataId
=
true
,
readConverterExp
=
"0=在职,1=离职"
)
@ExcelAttribute
(
name
=
"在职状态"
,
errorInfo
=
"在职状态 0是/1否不能为空"
,
maxLength
=
1
,
isDataId
=
true
,
readConverterExp
=
"0=在职,1=离职"
)
@Schema
(
description
=
"在职状态 0是/1否"
,
name
=
"workFlag"
)
private
String
workFlag
;
/**
* 在职状态扩展 0 在职 1 个人离职 2 单位辞退 3 临时 4 特殊人员 5 退休 6 退休返聘
*/
@ExcelAttribute
(
name
=
"在职细分"
,
isDataId
=
true
,
dataType
=
"work_falg_sub"
)
@ExcelAttribute
(
name
=
"在职细分"
,
isDataId
=
true
,
dataType
=
"work_falg_sub"
)
@Schema
(
description
=
"在职细分 0 在职 1 个人离职 2 单位辞退 3 临时 4 特殊人员 5 退休 6 退休返聘"
,
name
=
"workingStatusSub"
)
private
String
workingStatusSub
;
/**
* 合同试用期开始时间
*/
@ExcelAttribute
(
name
=
"试用期开始时间"
)
@Schema
(
description
=
"合同试用期开始时间"
,
name
=
"periodStart"
)
private
Local
Date
periodStart
;
@ExcelAttribute
(
name
=
"试用期开始时间"
)
@Schema
(
description
=
"合同试用期开始时间"
,
name
=
"periodStart"
)
private
Date
periodStart
;
/**
* 合同试用期结束时间
*/
@ExcelAttribute
(
name
=
"试用期结束时间"
)
@Schema
(
description
=
"合同试用期结束时间"
,
name
=
"periodEnd"
)
private
Local
Date
periodEnd
;
@ExcelAttribute
(
name
=
"试用期结束时间"
)
@Schema
(
description
=
"合同试用期结束时间"
,
name
=
"periodEnd"
)
private
Date
periodEnd
;
/**
* 试用期工资元/月
*/
@ExcelAttribute
(
name
=
"试用期工资元/月"
)
@Schema
(
description
=
"试用期工资(元/月)"
,
name
=
"periodSalaryPerMonth"
)
@ExcelAttribute
(
name
=
"试用期工资元/月"
)
@Schema
(
description
=
"试用期工资(元/月)"
,
name
=
"periodSalaryPerMonth"
)
private
BigDecimal
periodSalaryPerMonth
;
/**
* 工资形式 1.计时工资 2.计件工资 3.其他
*/
@Length
(
max
=
1
,
message
=
"工资形式不能超过1个字符"
)
@ExcelAttribute
(
name
=
"工资形式"
,
maxLength
=
1
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
SALARY_TYPE
)
@Schema
(
description
=
"工资形式 1.计时工资 2.计件工资 3.其他"
,
name
=
"salaryType"
)
@Length
(
max
=
1
,
message
=
"工资形式不能超过1个字符"
)
@ExcelAttribute
(
name
=
"工资形式"
,
maxLength
=
1
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
SALARY_TYPE
)
@Schema
(
description
=
"工资形式 1.计时工资 2.计件工资 3.其他"
,
name
=
"salaryType"
)
private
String
salaryType
;
/**
* 计时工资 工资标准 元/月
*/
@ExcelAttribute
(
name
=
"计时工资(元/月)"
)
@Schema
(
description
=
"计时工资 工资标准 元/月 "
,
name
=
"salaryStandardPerHour"
)
@ExcelAttribute
(
name
=
"计时工资(元/月)"
)
@Schema
(
description
=
"计时工资 工资标准 元/月 "
,
name
=
"salaryStandardPerHour"
)
private
BigDecimal
salaryStandardPerHour
;
/**
* 计件工资 工资标准单价/元
*/
@ExcelAttribute
(
name
=
"计件工资(单价/元)"
)
@Schema
(
description
=
"计件工资 工资标准单价/元 "
,
name
=
"salaryStandardPerPiece"
)
@ExcelAttribute
(
name
=
"计件工资(单价/元)"
)
@Schema
(
description
=
"计件工资 工资标准单价/元 "
,
name
=
"salaryStandardPerPiece"
)
private
BigDecimal
salaryStandardPerPiece
;
/******************************查询优化新增字段结束***********************************/
/**
* 派单标识 默认null 如果派单产生 为1 派单审核通过 清空标识 2020-09-27 fxj
*/
@ExcelAttribute
(
name
=
"派单标识"
)
@Schema
(
description
=
"派单标识"
,
name
=
"dispatchFlag"
)
@ExcelAttribute
(
name
=
"派单标识"
)
@Schema
(
description
=
"派单标识"
,
name
=
"dispatchFlag"
)
private
String
dispatchFlag
;
/**
* 邮件提醒用户id
...
...
@@ -342,68 +342,68 @@ public class TEmployeeContractInfo extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
endDateStr
;
@ExcelAttribute
(
name
=
"电子合同"
,
readConverterExp
=
"0=不开通,1=开通"
)
@Schema
(
description
=
"电子合同:0不开通 1开通"
,
name
=
"fddFlag"
)
@ExcelAttribute
(
name
=
"电子合同"
,
readConverterExp
=
"0=不开通,1=开通"
)
@Schema
(
description
=
"电子合同:0不开通 1开通"
,
name
=
"fddFlag"
)
private
String
fddFlag
;
@ExcelAttribute
(
name
=
"是否需要电子签"
,
readConverterExp
=
"0=正常合同,1=需要电子签"
)
@Schema
(
description
=
"是否需要电子签:0正常合同 1需要电子签"
,
name
=
"isSign"
)
@ExcelAttribute
(
name
=
"是否需要电子签"
,
readConverterExp
=
"0=正常合同,1=需要电子签"
)
@Schema
(
description
=
"是否需要电子签:0正常合同 1需要电子签"
,
name
=
"isSign"
)
private
Integer
isSign
;
/**
* 客户id
*/
@Schema
(
description
=
"客户id"
)
@Schema
(
description
=
"客户id"
)
private
String
customerId
;
/**
* 客户编码
*/
@Schema
(
description
=
"客户编码"
)
@Schema
(
description
=
"客户编码"
)
private
String
unitNo
;
/**
* 项目编码
*/
@Schema
(
description
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
/**
* 申请编码
*/
@Schema
(
description
=
"申请编码"
)
@Schema
(
description
=
"申请编码"
)
private
String
applyNo
;
/**
* 审核状态(0:待提交;1:待审核;2审核通过;3审核不通过)
*/
@Schema
(
description
=
"审核状态(0:待提交;1:待审核;2审核通过;3审核不通过)"
)
@Schema
(
description
=
"审核状态(0:待提交;1:待审核;2审核通过;3审核不通过)"
)
private
Integer
auditStatus
;
/**
* 最新审核通过时间
*/
@DateTimeFormat
(
"yyyy-MM-dd HH:mm:ss"
)
@Schema
(
description
=
"最新审核通过时间"
)
@Schema
(
description
=
"最新审核通过时间"
)
private
LocalDateTime
auditTimeLast
;
/**
* 删除状态(0未删除;1已删除)
*/
@Schema
(
description
=
"删除状态(0未删除;1已删除)"
)
@Schema
(
description
=
"删除状态(0未删除;1已删除)"
)
private
Integer
deleteFlag
;
/**
* 审核原因
*/
@Schema
(
description
=
"审核说明,前端传参用,字段不存数据库,数据库存审核记录"
)
@Schema
(
description
=
"审核说明,前端传参用,字段不存数据库,数据库存审核记录"
)
@TableField
(
exist
=
false
)
private
String
auditRemark
;
/**
* 员工类型(字典值,0外包1派遣2代理)
*/
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Size
(
max
=
1
,
message
=
"员工类型不可超过1位"
)
private
String
empNatrue
;
...
...
@@ -434,7 +434,7 @@ public class TEmployeeContractInfo extends BaseEntity {
private
String
reason
;
@Schema
(
description
=
"附件idList"
)
@Schema
(
description
=
"附件idList"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
attaList
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
31429be4
...
...
@@ -26,7 +26,7 @@ import org.hibernate.validator.constraints.Length;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.
time.Local
Date
;
import
java.
util.
Date
;
/**
* 员工合同-批量操作的VO
...
...
@@ -122,16 +122,16 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
*/
@NotBlank
(
message
=
"起始日期不能为空"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
@ExcelAttribute
(
name
=
"起始日期"
,
isNotEmpty
=
true
,
errorInfo
=
"起始日期不能为空"
)
@ExcelAttribute
(
name
=
"起始日期"
,
isNotEmpty
=
true
,
errorInfo
=
"起始日期不能为空"
,
isDate
=
true
)
@Schema
(
description
=
"起始日期"
,
name
=
"contractStart"
)
private
Local
Date
contractStart
;
private
Date
contractStart
;
/**
* 合同到期时间
*/
@ExcelAttribute
(
name
=
"截止日期"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"截止日期"
,
needExport
=
true
,
isDate
=
true
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
@Schema
(
description
=
"截止日期"
,
name
=
"contractEnd"
)
private
Local
Date
contractEnd
;
private
Date
contractEnd
;
/**
* 合同岗位
...
...
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