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
73df2b58
You need to sign in or sign up before continuing.
Commit
73df2b58
authored
Apr 24, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
2bd14352
23638033
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
77 deletions
+51
-77
TContractPreDetail.java
...loud/plus/v1/yifu/archives/entity/TContractPreDetail.java
+26
-44
TContractPreDetailVo.java
.../cloud/plus/v1/yifu/archives/vo/TContractPreDetailVo.java
+25
-33
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TContractPreDetail.java
View file @
73df2b58
...
@@ -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
;
/**
/**
...
@@ -44,31 +45,23 @@ public class TContractPreDetail extends BaseEntity {
...
@@ -44,31 +45,23 @@ public class TContractPreDetail extends BaseEntity {
private
String
applyNo
;
private
String
applyNo
;
/**
/**
*
申请人
*
档案-省
*/
*/
@ExcelAttribute
(
name
=
"申请人"
,
maxLength
=
100
)
@ExcelAttribute
(
name
=
"档案-省"
,
maxLength
=
32
,
isDataId
=
true
,
isArea
=
true
,
parentField
=
""
)
@Length
(
max
=
100
,
message
=
"申请人不能超过100个字符"
)
@Schema
(
description
=
"档案-省"
,
name
=
"fileProvince"
)
@ExcelProperty
(
"申请人"
)
private
Integer
fileProvince
;
@Schema
(
description
=
"申请人"
)
private
String
applicantName
;
/**
/**
*
申请时间
*
档案-市
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@ExcelAttribute
(
name
=
"档案-市"
,
maxLength
=
32
,
isDataId
=
true
,
isArea
=
true
,
parentField
=
"fileProvince"
)
@ExcelAttribute
(
name
=
"申请时间"
)
@Schema
(
description
=
"档案-市"
,
name
=
"fileCity"
)
@ExcelProperty
(
"申请时间"
)
private
Integer
fileCity
;
@Schema
(
description
=
"申请时间"
)
private
Date
applyTime
;
/**
/**
* 档案
所在地
* 档案
-县
*/
*/
@ExcelAttribute
(
name
=
"档案所在地"
,
maxLength
=
200
)
@ExcelAttribute
(
name
=
"档案-县"
,
maxLength
=
32
,
isDataId
=
true
,
isArea
=
true
,
parentField
=
"fileCity"
)
@Length
(
max
=
200
,
message
=
"档案所在地不能超过200个字符"
)
@Schema
(
description
=
"档案-县"
,
name
=
"fileTown"
)
@ExcelProperty
(
"档案所在地"
)
private
Integer
fileTown
;
@Schema
(
description
=
"档案所在地"
)
private
String
fileLocation
;
/**
/**
* 合同类型
* 合同类型
...
@@ -77,7 +70,7 @@ public class TContractPreDetail extends BaseEntity {
...
@@ -77,7 +70,7 @@ public class TContractPreDetail extends BaseEntity {
@Length
(
max
=
50
,
message
=
"合同类型不能超过50个字符"
)
@Length
(
max
=
50
,
message
=
"合同类型不能超过50个字符"
)
@ExcelProperty
(
"合同类型"
)
@ExcelProperty
(
"合同类型"
)
@Schema
(
description
=
"合同类型"
)
@Schema
(
description
=
"合同类型"
)
private
String
contract
Typ
e
;
private
String
contract
Nam
e
;
/**
/**
* 签订类型
* 签订类型
...
@@ -95,25 +88,23 @@ public class TContractPreDetail extends BaseEntity {
...
@@ -95,25 +88,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 +115,6 @@ public class TContractPreDetail extends BaseEntity {
...
@@ -124,15 +115,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
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TContractPreDetailVo.java
View file @
73df2b58
...
@@ -37,63 +37,62 @@ public class TContractPreDetailVo implements Serializable {
...
@@ -37,63 +37,62 @@ public class TContractPreDetailVo implements Serializable {
private
String
applyNo
;
private
String
applyNo
;
/**
/**
*
申请人
*
档案-省
*/
*/
@ExcelProperty
(
"
申请人
"
)
@ExcelProperty
(
"
档案-省
"
)
@Schema
(
description
=
"
申请人
"
)
@Schema
(
description
=
"
档案-省"
,
name
=
"fileProvince
"
)
private
String
applicantNam
e
;
private
Integer
fileProvinc
e
;
/**
/**
*
申请时间
*
档案-市
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@ExcelProperty
(
"档案-市"
)
@ExcelProperty
(
"申请时间"
)
@Schema
(
description
=
"档案-市"
,
name
=
"fileCity"
)
@Schema
(
description
=
"申请时间"
)
private
Integer
fileCity
;
private
Date
applyTime
;
/**
/**
* 档案
所在地
* 档案
-县
*/
*/
@ExcelProperty
(
"档案
所在地
"
)
@ExcelProperty
(
"档案
-县
"
)
@Schema
(
description
=
"档案
所在地
"
)
@Schema
(
description
=
"档案
-县"
,
name
=
"fileTown
"
)
private
String
fileLocatio
n
;
private
Integer
fileTow
n
;
/**
/**
* 合同类型
* 合同类型
*/
*/
@ExcelProperty
(
"合同类型"
)
@ExcelProperty
(
"合同类型"
)
@Schema
(
description
=
"合同类型"
)
@Schema
(
description
=
"合同类型"
,
name
=
"contractName"
)
private
String
contract
Typ
e
;
private
String
contract
Nam
e
;
/**
/**
* 签订类型
* 签订类型
*/
*/
@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
contractStart
Date
;
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
contractEnd
Date
;
private
Date
contractEnd
;
/**
/**
* 审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)
* 审核状态(0:待提交;1:待审核;2审核通过;3审核不通过;4签署中;5撤销签署;6签署失败)
...
@@ -102,13 +101,6 @@ public class TContractPreDetailVo implements Serializable {
...
@@ -102,13 +101,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
*/
*/
...
...
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